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

* commit '7f2ad751aebf9d13d63f20a451c28d4a41c4569a':
  Switch x86 default compiler to multilib version