Merge "Yet another vp9_pred_common.c cleanup."