Merge "ART: Fix swap usage determination in dex2oat" into nyc-dev