Merge "Cleaning up vp9_regular_quantize_b_4x4."