diff --git a/project/jni/application/simplemixer/AndroidAppSettings.cfg b/project/jni/application/simplemixer/AndroidAppSettings.cfg
index 1b2bcaf7b..63120a6e2 100644
--- a/project/jni/application/simplemixer/AndroidAppSettings.cfg
+++ b/project/jni/application/simplemixer/AndroidAppSettings.cfg
@@ -30,6 +30,5 @@ CustomBuildScript=n
 AppCflags='-O2 -finline-functions'
 AppLdflags=''
 AppSubdirsBuild=''
-AppUseCrystaXToolchain=n
 AppCmdline=''
 ReadmeText='^'
diff --git a/project/jni/application/src b/project/jni/application/src
index 104f796a6..92362c4db 120000
--- a/project/jni/application/src
+++ b/project/jni/application/src
@@ -1 +1 @@
-ballfield
\ No newline at end of file
+ufoai
\ No newline at end of file
diff --git a/project/jni/intl/include/libintl.h b/project/jni/intl/include/libintl.h
index 7fe9c6129..a413df680 100644
--- a/project/jni/intl/include/libintl.h
+++ b/project/jni/intl/include/libintl.h
@@ -427,13 +427,13 @@ extern int vswprintf (wchar_t *, size_t, const wchar_t *, va_list);
 
 
 /* Support for the locale chosen by the user.  */
-#if (defined __APPLE__ && defined __MACH__) || defined _WIN32 || defined __WIN32__ || defined __CYGWIN__
+#if (defined __APPLE__ && defined __MACH__) || defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined ANDROID
 
 #undef setlocale
 #define setlocale libintl_setlocale
 extern char *setlocale (int, const char *);
 
-#if 1
+#if !defined ANDROID
 
 #undef newlocale
 #define newlocale libintl_newlocale
diff --git a/project/jni/intl/src/config.h b/project/jni/intl/src/config.h
index e96960edb..82abdb23b 100644
--- a/project/jni/intl/src/config.h
+++ b/project/jni/intl/src/config.h
@@ -59,7 +59,7 @@
 
 /* Define to 1 if realpath() can malloc memory, always gives an absolute path,
    and handles trailing slash correctly. */
-/* #undef FUNC_REALPATH_WORKS */
+#define FUNC_REALPATH_WORKS 1
 
 /* Define to a C preprocessor expression that evaluates to 1 or 0, depending
    whether the gnulib module canonicalize-lgpl shall be considered present. */
@@ -784,7 +784,7 @@
 #define HAVE_SETENV 1
 
 /* Define to 1 if you have the `setlocale' function. */
-/* #define HAVE_SETLOCALE 1 */
+#define HAVE_SETLOCALE 1
 
 /* Define to 1 if you have the <signal.h> header file. */
 #define HAVE_SIGNAL_H 1
diff --git a/project/jni/intl/src/libgnuintl.h b/project/jni/intl/src/libgnuintl.h
index 54d212eab..909221445 100644
--- a/project/jni/intl/src/libgnuintl.h
+++ b/project/jni/intl/src/libgnuintl.h
@@ -433,13 +433,13 @@ extern LIBINTL_DLL_EXPORTED int vswprintf (wchar_t *, size_t, const wchar_t *, v
 
 
 /* Support for the locale chosen by the user.  */
-#if (defined __APPLE__ && defined __MACH__) || defined _WIN32 || defined __WIN32__ || defined __CYGWIN__
+#if (defined __APPLE__ && defined __MACH__) || defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined ANDROID
 
 #undef setlocale
 #define setlocale libintl_setlocale
 extern LIBINTL_DLL_EXPORTED char *setlocale (int, const char *);
 
-#if 1
+#if !defined ANDROID
 
 #undef newlocale
 #define newlocale libintl_newlocale
diff --git a/project/jni/intl/src/setlocale.c b/project/jni/intl/src/setlocale.c
index 2a5e2605b..fd3677534 100644
--- a/project/jni/intl/src/setlocale.c
+++ b/project/jni/intl/src/setlocale.c
@@ -44,7 +44,7 @@
 
 #include "gettextP.h"
 
-#if (defined __APPLE__ && defined __MACH__) || defined _WIN32 || defined __WIN32__ || defined __CYGWIN__
+#if (defined __APPLE__ && defined __MACH__) || defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined ANDROID
 
 # undef setlocale
 # undef newlocale