am 54e12480: am ff716cb9: am 7411a699: Merge "Use unique location catalogs to encode Dex register maps." * commit '54e12480': Use unique location catalogs to encode Dex register maps.