Merge "Cleaning up vp9_ratectl.c."