Merge "Rewrite stackmap verification code."