am 7411a699: Merge "Use unique location catalogs to encode Dex register maps."

* commit '7411a69982c055692966c685636b6a226f10215e':
  Use unique location catalogs to encode Dex register maps.