Merge "Revert "ART: Add dex2oat swap usage test""