Merge "Simplify StackMapStream encoding."
am: 8e7ddc234e

Change-Id: Ic359622069e501e99ae8b985ca44854fd1ebe011