Merge "Track libcore changes for OpenSSLKey"