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

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

Change-Id: I8349f4a9f338d3f971950cfadea0fd085942e3ff