Issue 3297 - Fix issues introduced by recent libadblockplus changes and update dependencies

jni/JniJsEngine.cpp

Index: jni/JniJsEngine.cpp
diff --git a/jni/JniJsEngine.cpp b/jni/JniJsEngine.cpp
index f8951f88b57e4a219f88ffbf7dd8a6a26042403e..227d0c7e7f022376f707c2027baa76306c2a8b23 100644
--- a/jni/JniJsEngine.cpp
+++ b/jni/JniJsEngine.cpp
@@ -25,7 +25,6 @@ static void TransformAppInfo(JNIEnv* env, jobject jAppInfo, AdblockPlus::AppInfo
 
   appInfo.application = JniGetStringField(env, clazz, jAppInfo, "application");
   appInfo.applicationVersion = JniGetStringField(env, clazz, jAppInfo, "applicationVersion");
-  appInfo.id = JniGetStringField(env, clazz, jAppInfo, "id");
   appInfo.locale = JniGetStringField(env, clazz, jAppInfo, "locale");
   appInfo.name = JniGetStringField(env, clazz, jAppInfo, "name");
   appInfo.version = JniGetStringField(env, clazz, jAppInfo, "version");
@@ -57,7 +56,7 @@ static void JNICALL JniSetEventCallback(JNIEnv* env, jclass clazz, jlong ptr, js
 
   JniEventCallback* callback = JniLongToTypePtr<JniEventCallback>(jCallbackPtr);
   std::string eventName = JniJavaToStdString(env, jEventName);
-  AdblockPlus::JsEngine::EventCallback eCallback = std::tr1::bind(&JniEventCallback::Callback, callback, std::tr1::placeholders::_1);
+  AdblockPlus::JsEngine::EventCallback eCallback = std::bind(&JniEventCallback::Callback, callback, std::placeholders::_1);
 
   try
   {