Merge "Use intra_ext_tx_cdf when coding tx_type." into nextgenv2