Merge "keystore2: Implement ECDH in wrapper."