Merge "Revert^2 "Optimize register mask and stack mask in stack maps."" am: 08231f6c am: 70e906a9 am: 3cabd0e8 Change-Id: Ibdebd53ca5bf882f8673b86057a37c64b179ce92