am 3058325d: (-s ours) Merge "Remove KM_TAG_AEAD_TAG."

* commit '3058325de9557ae1eeb71b2ff765f6dc8c867086':
  Remove KM_TAG_AEAD_TAG.