Merge \\"ART: Fix swap usage determination in dex2oat\\" am: 2947549659
am: cb21f65880

Change-Id: I0a1d0ae51ede03eb99fc8910b572d3c44f830b07