am 92aaf481: am 63c8be99: Merge "ART: Clean up less in dex2oat"

* commit '92aaf481015fb78cfa868e87349bacaec41870c1':
  ART: Clean up less in dex2oat