Merge "General cleanup in vp9_encodeframe.c."