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

Change-Id: I10eed16a915d619ba5693b279c45fd001dedafb3