Merge "vp9_encoder.c,cosmetics: fix some typos"