Merge "Tweak default x86 target arch variant."