am f655ce7e: Merge "Fix x86 build."

* commit 'f655ce7ef3df277442ccc47f91cb919c1cd9ebd6':
  Fix x86 build.