Merge "Cleaning up vp9_encodeframe.c."