Merge "Deduplicate register maps for both inline and normal stack maps" am: 518f373324
am: f14db6abca

Change-Id: I710f05b275cfbb77ff0236732108bef1e0b3a908