diff -r 38f5b3beeb2a Include/androidfn.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Include/androidfn.h	Mon Apr 06 11:17:34 2015 -0500
@@ -0,0 +1,15 @@
+/* Fix for broken Android mbstowcs, from rjmatthews62@gmail.com */
+#ifndef Py_ANDROIDFN_H
+#define Py_ANDROIDFN_H
+
+#include <stdlib.h>
+
+/* this MUST come after the stdlib.h include */
+#ifdef __ANDROID__
+size_t android_wcstombs(char * dest, const wchar_t *source, int maxlen);
+size_t android_mbstowcs(wchar_t *dest, const char * source, int maxlen);
+#define wcstombs android_wcstombs
+#define mbstowcs android_mbstowcs
+#endif
+
+#endif /* !Py_ANDROIDFN_H */