Merge "Enable dex2oat swap test for CC on x86."