am 096a0597: am ebbb1e32: Merge "Use variable encoding for StackMap."

* commit '096a05979d84b2e217c398eb0b71e6fb3c6534ce':
  Use variable encoding for StackMap.