Merge "Fix ifdef, its operand is literal variable name" am: 469c229565 am: d37bfbeeb5 am: 0558051d3e

Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1509509

Change-Id: I76d9da7a0d33f2ac04839cd93b88ad27fcda94a7