Merge "Disable the dex2oat swap test for x86 altogether."