Merge "Update KeyPairGeneratorTest for EC keys"