Merge "Speed up tm_predictor_16x16"