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

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