Merge "vp9_pickmode.c: fix vs12 compiler warnings"