Merge "vp9_encodeframe.c cleanup."