Merge "Revert^2 "Optimize register mask and stack mask in stack maps.""
am: 08231f6cb3

Change-Id: Ibd4a0632bcfa2ac79d7c9011b1bf77331d60527a