am b71677b1: Merge "Extend x86 to have different arch variants"

* commit 'b71677b17cc0100caf16209bfcd1eee529e2eb5a':
  Extend x86 to have different arch variants