am 3f2c03f3: am e66f6318: Merge "Fix x86 build."

* commit '3f2c03f38f8fc3fd0310002f10f70145d180a364':
  Fix x86 build.