Merge "Rewrite stackmap encoding code."
am: 64e8175b61

Change-Id: Ibf321689aaf4029d425b970965a574655c1626ee