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

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

Change-Id: Icc0c91262853184cc580a41a9fa50af56e7533b6