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

* commit 'd2040cb2244bbd253951b5ff808efe67246e5154':
  Fix x86 build.