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

Change-Id: Ic5d3353ab5b475fe32c09deeaf8478c8187f43a1