Move userId out of AAD and into plaintext.

We want to maintain compatibility with the node crypto module, which
doesn't currently have an interface for specifying AAD.