Merge "Skip Elliptic curve DH in KeyFactory2Test."