Merge NEW_TOKENSET experiment into EC_MULTISYMBOL.

Change-Id: I0ed6d8f2b6a83641f65096cf41fcde94e70d94d4
11 files changed