Merge "Code cleanup in vp9_pred_common.c"