Android build fixes and alternate (hopefully simpler) defconfig for it

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
diff --git a/include/platform.h b/include/platform.h
index 826a4c4..aa1bc33 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -433,7 +433,7 @@
 # undef HAVE_STPCPY
 #endif
 
-#if defined(ANDROID)
+#if defined(ANDROID) || defined(__ANDROID__)
 # undef HAVE_DPRINTF
 # undef HAVE_GETLINE
 # undef HAVE_STPCPY