Merge "ART: Clean up less in dex2oat" into mnc-dr-dev