Merge "Revert "Optimize register mask and stack mask in stack maps.""
am: 010b10e7ab

Change-Id: Ic6b8a024ded6256bd618e38287e943dd89f86f21