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

* commit '63c8be99c025eafb9241d5b2b3c86749f4e79e11':
  ART: Clean up less in dex2oat