Merge "Revert "Enable dex2oat swap test for CC on x86."" am: aff5505d85 am: b5a1e26eb9
am: 00010c53b1

Change-Id: I1e280cfd70111bc231e21c4a49a254f52ff93a92