am 9d84edba: am 09b021a5: conscrypt: guard some error values that will be removed in BoringSSL.
am 9d84edba: am 09b021a5: conscrypt: guard some error values that will be removed in BoringSSL.

* commit '9d84edba7fe8109810f98d7af9fff56970b97ef7':
  conscrypt: guard some error values that will be removed in BoringSSL.

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