Merge "Merge \\"ART: Fix swap usage determination in dex2oat\\" into nyc-dev am: 6822c26c am: 99949236" into nyc-mr1-dev-plus-aosp