Merge "Revert^2 "Optimize register mask and stack mask in stack maps.""