am 4d71adbc: am 10225071: Merge "Fixes x86 build."

* commit '4d71adbc0d12e5153f537f84cce8d9686762e5b9':
  Fixes x86 build.