Merge "vp9_tokenize.c: cleanup -wextra warnings"