Merge "Code clean of highbd_dc_predictor_4x4"