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

Change-Id: I2f5c3510a9ecc9684e54c10d7f666497b20d23cf