Merge "Port android CipherSpi selection algorithm to openJdk"