Merge \"ART: Fix swap usage determination in dex2oat\" into nyc-dev
am: 6822c26c81

Change-Id: I0f32ad91c9974fe2360e876d59e7c4f2a214bddf