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

* commit 'ebbb1e322d8c89e69424a543faa03402e5b63673':
  Use variable encoding for StackMap.