Merge \"Revert \"Revert \"ART: Add dex2oat swap usage test\"\"\"
am: edbecee66f

Change-Id: I3321270cf3746b172208b628dbddc968db1c5482