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

* commit '2530c787db272bfb4afab80e37323b9b7d00671c':
  More consistent host library path in multilib build.