am c137c2ba: Merge "Fix multilib build warning."

* commit 'c137c2ba3a01c453c75fc0f635aba436cbf25581':
  Fix multilib build warning.