Merge "Convert to UTF8 before doing dex file location comparison"
am: eacffa6f85

* commit 'eacffa6f85e7877719dacde933e7dccc927ba600':
  Convert to UTF8 before doing dex file location comparison