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

Change-Id: I61c6aa7d5057a49639312262bc74f9162c827a70