Merge "Replace num_4x4_blocks_txsize_loopup table" into nextgenv2