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

Change-Id: I97b7d40751ca20051426fee238dc3a0fc1fb4ade