am 7733e126: am c137c2ba: Merge "Fix multilib build warning."

* commit '7733e12673cd43dc101269d6159174722109c15f':
  Fix multilib build warning.