Merge \"ART: Add dex2oat swap-usage parameters\"
am: 0d38e26dad

Change-Id: I183a53f1495d244a2f2c03d69c8a28e0f7d3f8a4