am f5ea738b: Merge "Fix x86 build."

* commit 'f5ea738baa0ad5b32348f2ac42450d33d452ef31':
  Fix x86 build.