Merge "Convert to UTF8 before doing dex file location comparison"