Merge "Renames for consistency in vp9_pred_common.{c, h} files."