Pull in CombineTokens changes for AFSCombineTokens

We use the preexisting CombineOptions and TokenInfo structures,
and call out the errorcode field in particular.

Change-Id: Ief386a455aef7da9228af5e0bfcda3c196bda0be