Merge "Code clean of highbd_v_predictor_4x4"