Merge "Code clean of highbd_tm_predictor_4x4"