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