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/evutil_rand.c b/src/main/jni/libevent/evutil_rand.c
index 284e230e..147802aa 100644
--- a/src/main/jni/libevent/evutil_rand.c
+++ b/src/main/jni/libevent/evutil_rand.c
@@ -59,7 +59,8 @@ static void
 ev_arc4random_buf(void *buf, size_t n)
 {
 #if defined(_EVENT_HAVE_ARC4RANDOM_BUF) && !defined(__APPLE__)
-	return arc4random_buf(buf, n);
+	arc4random_buf(buf, n);
+    return;
 #else
 	unsigned char *b = buf;
 
@@ -71,7 +72,8 @@ ev_arc4random_buf(void *buf, size_t n)
 	 * trickery.)
 	 */
 	if (arc4random_buf != NULL) {
-		return arc4random_buf(buf, n);
+		arc4random_buf(buf, n);
+        return;
 	}
 #endif
 	/* Make sure that we start out with b at a 4-byte alignment; plenty