Merge "Clean up naming of VP9 support functions."