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

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