Do not use clang to build x86
am: bec9990f58

* commit 'bec9990f589ec73ea1eb46bf8faf551dc6da4dde':
  Do not use clang to build x86