am 2e99d3c9: am ebb61ca2: Merge "Track libcore changes for OpenSSLKey"

# Via Android Git Automerger (1) and others
* commit '2e99d3c9646861ca92faf6708c18e36c7530fd93':
  Track libcore changes for OpenSSLKey