Merge "Speed up h_predictor_4x4"