am 78706f91: am 0db9ea92: Merge "Fix a preprocessor warning exposed by -Wundef."

* commit '78706f9149b2513bd71672aaa651cd8855088fe3':
  Fix a preprocessor warning exposed by -Wundef.