am 0a40828e: Merge "Improve dex location canonicalization-related performance." into lmp-dev

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