Merge "Removing redundant code mostly from vp9_pred_common.{h, c}."