am 4ca6e2e5: am 38c0ac73: Merge "Use debug versions of dex2oat explicitly."

* commit '4ca6e2e52832d894b6387120e8b1c447121b5135':
  Use debug versions of dex2oat explicitly.