Merge "Don't set x86 arch variant."