Merge "Use TX_SIZES in intra_high_pred_fn declarations" into nextgenv2