Merge "Cleaning up vp9_encoder.c."