Merge "Improve dex location canonicalization-related performance."