am 10225071: Merge "Fixes x86 build."

* commit '102250719f8aff443741e54ba5633c7722544620':
  Fixes x86 build.