diff --git a/build/android/common.mk b/build/android/common.mk
index 39ccf178c..a997c26ab 100644
--- a/build/android/common.mk
+++ b/build/android/common.mk
@@ -97,6 +97,11 @@ LOCAL_STATIC_LIBRARIES := \
 	libortp \
 	libbellesip \
 	libgsm 
+ifeq ($(BUILD_REMOTE_PROVISIONING),1)
+LOCAL_STATIC_LIBRARIES += \
+	libxml2lpc \
+	liblpc2xml
+endif
 
 ifeq ($(BUILD_TUNNEL),1)
 LOCAL_CFLAGS +=-DTUNNEL_ENABLED
diff --git a/build/android/lpc2xml.mk b/build/android/lpc2xml.mk
index b5757ad99..91038adce 100644
--- a/build/android/lpc2xml.mk
+++ b/build/android/lpc2xml.mk
@@ -39,10 +39,10 @@ LOCAL_C_INCLUDES = \
 	$(LOCAL_PATH)/../../externals/build/libxml2 \
 
 LOCAL_SHARED_LIBRARIES = \
-	libxml2 \
-	liblinphonenoneon \
-	liblinphone \
+	libxml2
+#	liblinphonenoneon \
+#	liblinphone \
 
 LOCAL_MODULE := liblpc2xml
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/build/android/xml2lpc.mk b/build/android/xml2lpc.mk
index 449251cc8..e89ab383b 100644
--- a/build/android/xml2lpc.mk
+++ b/build/android/xml2lpc.mk
@@ -39,10 +39,10 @@ LOCAL_C_INCLUDES = \
 	$(LOCAL_PATH)/../../externals/build/libxml2 \
 
 LOCAL_SHARED_LIBRARIES = \
-	libxml2 \
-	liblinphonenoneon \
-	liblinphone \
+	libxml2
+#	liblinphonenoneon \
+#	liblinphone \
 
 LOCAL_MODULE := libxml2lpc
 
-include $(BUILD_SHARED_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 62965dad2..8b3e1b04c 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -424,11 +424,6 @@ void linphone_core_set_log_file(FILE *file) {
 
 void linphone_core_set_log_level(OrtpLogLevel loglevel) {
 	ortp_set_log_level_mask(loglevel);
-	if (loglevel == 0) {
-		sal_disable_logs();
-	} else {
-		sal_enable_logs();
-	}
 }
 
 /**
diff --git a/java/impl/org/linphone/tools/Lpc2Xml.java b/java/impl/org/linphone/tools/Lpc2Xml.java
index 97ef99637..2f3d90751 100644
--- a/java/impl/org/linphone/tools/Lpc2Xml.java
+++ b/java/impl/org/linphone/tools/Lpc2Xml.java
@@ -59,7 +59,7 @@ public class Lpc2Xml {
 	static {
 		try {
 			System.loadLibrary("xml2");
-			System.loadLibrary("lpc2xml");
+			//System.loadLibrary("lpc2xml");
 			mAvailable = true;
 		} catch (Throwable e) {
 			mAvailable = false;
diff --git a/java/impl/org/linphone/tools/Xml2Lpc.java b/java/impl/org/linphone/tools/Xml2Lpc.java
index 9f6cb0f27..5e0a81880 100644
--- a/java/impl/org/linphone/tools/Xml2Lpc.java
+++ b/java/impl/org/linphone/tools/Xml2Lpc.java
@@ -63,7 +63,7 @@ public class Xml2Lpc {
 	static {
 		try {
 			System.loadLibrary("xml2");
-			System.loadLibrary("xml2lpc");
+			//System.loadLibrary("xml2lpc");
 			mAvailable = true;
 		} catch (Throwable e) {
 			mAvailable = false;