Make var-tx work with the re-designed cb4x4 Resolve tokenization and bit-stream packing issues in var-tx when the re-designed cb4x4 is enabled. Change-Id: I651f776104679eb7d4d0681f428490f668dc806a