Fix building for android (and add libsodium)