am cf71e0b6: Merge "Improve dex location canonicalization-related performance."

* commit 'cf71e0b62cf8e21082204de120416c776706b6c6':
  Improve dex location canonicalization-related performance.