Merge "Rewrite stackmap verification code."
am: 0366f3251c

Change-Id: I69731fb4d5f999df037737c0d875d151ca82ca22