am ffed0eb8: am 5c1ad337: Merge "Use command line android root in dex2oat to find image."

* commit 'ffed0eb8ede0e8bd48d3407b318a3785a3059d8d':
  Use command line android root in dex2oat to find image.