Merge "Replacing txfm_size with tx_size."