OpenSSLCipher: reset AAD when necessary am: b9d2def
OpenSSLCipher: reset AAD when necessary
am: b9d2def

* commit 'b9d2def213e1e72d203ea2f989dc485ce493a586':
  OpenSSLCipher: reset AAD when necessary

google/conscrypt,google/conscrypt,google/conscrypt,google/conscrypt,google/conscrypt,google/conscrypt