am fad629f4: am 7f2ad751: Merge "Switch x86 default compiler to multilib version"

* commit 'fad629f4dd07720b427c6a219ad93886e23ca277':
  Switch x86 default compiler to multilib version