am a34e9955: am 7fdab460: Merge "Fix potential makefile bug."

* commit 'a34e995557157e6958db77795fb866712a99af43':
  Fix potential makefile bug.