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

Change-Id: Ib202d062d49a9075ac838c34496b6d0ebfdc2ce2