Merge "Switch x86 default compiler to multilib version"