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

* commit '1afca3f69887d9c761d448ddc0c4031176351fe1':
  Fix x86 build.