Merge "Rewrite dex register map encoding in stackmaps." am: 6bb8751785
am: b105bec8a7

Change-Id: I946750e27ac5f86b0f98afafefdaa8e7a00aac47