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

Change-Id: I73e351c4ed5f32ac7228bc349f1a8e9f31efe612