Merge "Refactor av1_predict_intra_block tx_size interface" into nextgenv2