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

Change-Id: I396c40f75164b90999f91283771bdd71ceaae3be