Merge "Cleaning up vp9_rdopt.c."