contrib/iconv: enable the Android patch for iOS as well and rename it to '-android-ios'

We need to check whether we would like to apply this patch by default on OS X and Windows, too.

contrib/src/iconv/rules.mak

@@ -24,7 +24,10 @@ ifdef HAVE_WINCE
 	$(APPLY) $(SRC)/iconv/libiconv-wince-hack.patch
 endif
 ifdef HAVE_ANDROID
-	$(APPLY) $(SRC)/iconv/libiconv-android.patch
+	$(APPLY) $(SRC)/iconv/libiconv-android-ios.patch
+endif
+ifdef HAVE_IOS
+	$(APPLY) $(SRC)/iconv/libiconv-android-ios.patch
 endif
 	$(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub build-aux
 	$(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub libcharset/build-aux