Merge "Fixing include order in vp9_quantize.c"