am 73ac7d94: am d2040cb2: am f655ce7e: Merge "Fix x86 build."

* commit '73ac7d94b7cf627524be97da7704206b5ffd4fcf':
  Fix x86 build.