Merge "Enable dex2oat swap test for CC on x86."
am: 5abcfe6254

Change-Id: I0e4dfd34563453e68fcc0876ba5c52e80de7c7cc