Merge "Cleaning up vp9_quantize.c."