am 828ffc4a: Merge "Fix multilib build."

* commit '828ffc4abfc99ff47edf7e485a3da82ecc49ea26':
  Fix multilib build.