diff --git a/src/main/jni/Application.mk b/src/main/jni/Application.mk
index d8820faa..8ea8eb37 100644
--- a/src/main/jni/Application.mk
+++ b/src/main/jni/Application.mk
@@ -1,4 +1,4 @@
 APP_ABI      			:= armeabi-v7a x86
 APP_PLATFORM 			:= android-16
 APP_STL      			:= stlport_static
-NDK_TOOLCHAIN_VERSION 	:= 4.9
+NDK_TOOLCHAIN_VERSION 	:= clang
diff --git a/src/main/jni/libevent b/src/main/jni/libevent
index 78fd4a4d..5fb6d9fc 160000
--- a/src/main/jni/libevent
+++ b/src/main/jni/libevent
@@ -1 +1 @@
-Subproject commit 78fd4a4dad9dab4eeb540779a6a3a69a8ce19c52
+Subproject commit 5fb6d9fc41f2c8e12822a39db88c0404d2e1642f