am 0d0b7b36: am 2530c787: am 4b539d15: Merge "More consistent host library path in multilib build."

* commit '0d0b7b3669d3cb309ddd26cf23ddddbe4d42fd8e':
  More consistent host library path in multilib build.