Fix an enc/dec mismatch issue in tokenization

Resolve an enc/dec mismatch issue in new-tokenset and var-tx.

BUG=aomedia:567

Change-Id: I9bd8ec4c7716bca3a5e551b6e9838fc8ef37f198
1 file changed