+diff -u -r /home/fornwall/lib/android-ndk/sources/android/support/include/iconv.h ./include/iconv.h
+--- /home/fornwall/lib/android-ndk/sources/android/support/include/iconv.h 2014-06-03 13:15:33.000000000 -0400
++++ ./include/iconv.h 2016-01-03 21:17:16.472527767 -0500
+@@ -28,8 +28,6 @@
+ #ifndef NDK_ANDROID_SUPPORT_ICONV_H
+ #define NDK_ANDROID_SUPPORT_ICONV_H
+
+-#if !defined(__LP64__)
+-
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+@@ -46,6 +44,4 @@
+ } // extern "C"
+ #endif
+
+-#endif // !__LP64__
+-
+ #endif // NDK_ANDROID_SUPPORT_ICONV_H