Merge "Disable the dex2oat swap test for x86 altogether." am: 8a36bce38f
am: e7320be431

Change-Id: I249b41b3cb3aee501f9146dfa99e5000aac4f09e