Use ECDH instead of RSA key exchange

Change-Id: I173fcd82269e74f72d1a49173467f771898af441