am d8c47285: am ee3b260e: Merge "ART: Use canonical location in dex2oat"

* commit 'd8c472852af0954afbe2f3a23d36806678c1fe82':
  ART: Use canonical location in dex2oat