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

Change-Id: I47c7e68474979e1e33f039473a0a599f7afaa6db