am 40b49d30: am a74ade94: Merge "Support host multilib build"

* commit '40b49d3043bd41ca5548b99b537038187fdca258':
  Support host multilib build