Merge "Refactor mbmi->inter_tx_size to 2D array." into nextgenv2