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	2016-03-03 16:54:04.000000000 -0500
+++ ./include/iconv.h	2016-05-25 16:15:29.543192668 -0400
@@ -28,8 +28,6 @@
 #ifndef NDK_ANDROID_SUPPORT_ICONV_H
 #define NDK_ANDROID_SUPPORT_ICONV_H
 
-#if !defined(__LP64__)
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -43,9 +41,7 @@
 int     iconv_close(iconv_t);
 
 #ifdef __cplusplus
-}  // extern "C"
+}
 #endif
 
-#endif // !__LP64__
-
-#endif  // NDK_ANDROID_SUPPORT_ICONV_H
+#endif