Revert^2 "Keystore: Validate curve names in XDH and ED25519" 653ac0cdc7fb5e96a73eed3066f84abf432ba22c Change-Id: I4afba276e84a4f535d1cfca8aa7863e463e61880