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

Change-Id: Ic7653896916527c34a7ca24be630eddd2f4e1c46