convert extra bit cat structure to const statics

Change-Id: Idb257e78dab2339ab1f41c3c82e537bc23e90b65
Tokenization without huge tables.

Change-Id: Iff528c4b7528cc70320343b3a7ce07a92b024dfd
Merge "convert extra bit cat structure to const statics"
Merge "Tokenization without huge tables."