am 2e389193: am a8a7f001: Merge "Fix x86 and x86_64 builds."

* commit '2e389193b01adb2d8f75e6c4038caaab4334b3ab':
  Fix x86 and x86_64 builds.