Merge "Simplify StackMapStream encoding." am: 8e7ddc234e
am: 2932e716bf

Change-Id: Ia8a8d38429dee3c194b99a575c340eb84460d387