am 2930074c: (-s ours) am ebaef4c5: am 39795fc5: Merge "ART: Clean up less in dex2oat" into mnc-dr-dev

* commit '2930074ccac12dc6b742782c7f942d997dc66e5b':
  ART: Clean up less in dex2oat