Merge "Code clean of highbd_tm_predictor_32x32"