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

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