am 5062fcb7: Merge "Fix multilib build"

* commit '5062fcb7c2268f58ea1c79da3a7618a27e2b41dd':
  Fix multilib build