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

Change-Id: If70d9b6b75e93496ed789a5891d078a16de3be17