SDL: updated submodules

.gitmodules

@@ -4,7 +4,7 @@
 [submodule "project/jni/boost/src"]
 	path = project/jni/boost/src
 	url = https://github.com/pelya/Boost-for-Android.git
-	branch = master2
+	branch = master
 	update = merge
 [submodule "project/jni/application/commandergenius/commandergenius"]
 	path = project/jni/application/commandergenius/commandergenius
@@ -36,6 +36,8 @@
 [submodule "project/jni/iconv/src"]
 	path = project/jni/iconv/src
 	url = https://github.com/pelya/libiconv-libicu-android.git
+	branch = master
+	update = merge
 [submodule "project/jni/application/openttd/src"]
 	path = project/jni/application/openttd/src
 	url = https://github.com/pelya/openttd-android.git

project/jni/application/ballfield/AndroidAppSettings.cfg

@@ -274,7 +274,7 @@ MultiABI='armeabi-v7a arm64-v8a x86 x86_64'
 # Optional shared libraries to compile - removing some of them will save space
 # MP3 support by libMAD is encumbered by patents and libMAD is GPL-ed
 # Available libraries: mad (GPL-ed!) sdl_mixer sdl_image sdl_ttf sdl_net sdl_blitpool sdl_gfx sdl_sound intl xml2 lua jpeg png ogg flac tremor vorbis freetype xerces curl theora fluidsynth lzma lzo2 mikmod openal timidity zzip bzip2 yaml-cpp python boost_date_time boost_filesystem boost_iostreams boost_program_options boost_regex boost_signals boost_system boost_thread glu avcodec avdevice avfilter avformat avresample avutil swscale swresample bzip2 
-CompiledLibraries="sdl_image boost_filesystem boost_system crypto ssl curl openal vorbis ogg"
+CompiledLibraries="sdl_image icui18n iculx icu-le-hb harfbuzz icudata icuuc iconv charset"
 
 # Application uses custom build script AndroidBuild.sh instead of Android.mk (y) or (n)
 CustomBuildScript=n