Merge "vp9_pickmode.c: Removed unused function parameters"