Merge "Cleaning up vp9_mvref_common.{h, c}."