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

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