am 945750a9: Merge "Fix host multilib build."

* commit '945750a9e055d443db1ca3d05223de47f32d3fd7':
  Fix host multilib build.