Merge "Extend x86 to have different arch variants"