Merge changes I06422b9a,I793c9ce0

* changes:
  Check for RFC 5746 TLS extension
  Revert "Update tests for BoringSSL roll."