am 65fd650a: Merge "Prepare for BoringSSL update."

* commit '65fd650a4ae3d8602bffc0fa469695228209e38b':
  Prepare for BoringSSL update.