am 6b4d6644: Merge "Fix host multilib build."

* commit '6b4d6644c7347ed974a6b00a7501bb94f02dddf6':
  Fix host multilib build.