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

* commit '1bc641625f468c101b249ddccd95818441a588bb':
  ART: Use canonical location in dex2oat