am e66f6318: Merge "Fix x86 build."

* commit 'e66f6318635c49313f796e62170fa8f59340e926':
  Fix x86 build.