Merge \"ART: Add dex2oat swap usage test\"
am: da2b8dc3ed

Change-Id: I019cccda99f190384f57bf2e23909ed79a74dc2d