Merge "Cleaning up vp9_xform_quant() function."