GCM tags in ciphertext, rather than in params.

Also, handle AAD correctly.

Bug: 21786749
Change-Id: I735f3d277c96bf4d3fed3ef433f96238b1f21187
6 files changed