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

Change-Id: Ie929925d22096a90fad1552c7bbb0b3aaca315e7