diff --git a/abi_settings.sh b/abi_settings.sh
index 766634a..7ca8ce7 100755
--- a/abi_settings.sh
+++ b/abi_settings.sh
@@ -26,7 +26,7 @@ esac
 
 TOOLCHAIN_PREFIX=${BASEDIR}/toolchain-android
 if [ ! -d "$TOOLCHAIN_PREFIX" ]; then
-  ${ANDROID_NDK_ROOT_PATH}/build/tools/make-standalone-toolchain.sh --toolchain=${NDK_TOOLCHAIN_ABI}-${NDK_TOOLCHAIN_ABI_VERSION} --platform=android-${ANDROID_API_VERSION} --install-dir=${TOOLCHAIN_PREFIX}
+  ${ANDROID_NDK_ROOT_PATH}/build/tools/make_standalone_toolchain.py --arch=${NDK_ABI} --api=${ANDROID_API_VERSION} --install-dir=${TOOLCHAIN_PREFIX}
 fi
 CROSS_PREFIX=${TOOLCHAIN_PREFIX}/bin/${NDK_CROSS_PREFIX}-
 NDK_SYSROOT=${TOOLCHAIN_PREFIX}/sysroot
diff --git a/android_build.sh b/android_build.sh
index 8fb4832..f808db8 100755
--- a/android_build.sh
+++ b/android_build.sh
@@ -5,10 +5,10 @@
 BASEDIR=$(pwd)
 TOOLCHAIN_PREFIX=${BASEDIR}/toolchain-android
 # Applying required patches
-patch  -p0 -N --dry-run --silent -f fontconfig/src/fcxml.c < android_donot_use_lconv.patch 1>/dev/null
-if [ $? -eq 0 ]; then
-  patch -p0 -f fontconfig/src/fcxml.c < android_donot_use_lconv.patch
-fi
+# patch  -p0 -N --dry-run --silent -f fontconfig/src/fcxml.c < android_donot_use_lconv.patch 1>/dev/null
+# if [ $? -eq 0 ]; then
+#   patch -p0 -f fontconfig/src/fcxml.c < android_donot_use_lconv.patch
+# fi
 
 for i in "${SUPPORTED_ARCHITECTURES[@]}"
 do
diff --git a/android_donot_use_lconv.patch b/android_donot_use_lconv.patch
deleted file mode 100644
index 7b5d100..0000000
--- a/android_donot_use_lconv.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/fcxml.c b/src/fcxml.c
-index 91d166f..cf5345e 100644
---- a/src/fcxml.c
-+++ b/src/fcxml.c
-@@ -1314,6 +1314,7 @@ FcParseInt (FcConfigParse *parse)
- static double
- FcStrtod (char *s, char **end)
- {
-+#ifndef __ANDROID__
-     struct lconv    *locale_data;
-     char	    *dot;
-     double	    v;
-@@ -1360,6 +1361,9 @@ FcStrtod (char *s, char **end)
-     else
- 	v = strtod (s, end);
-     return v;
-+#else
-+    return strtod (s, end);
-+#endif
- }
- 
- static void
diff --git a/expat_build.sh b/expat_build.sh
index 611c945..3220375 100755
--- a/expat_build.sh
+++ b/expat_build.sh
@@ -2,7 +2,7 @@
 
 . abi_settings.sh $1 $2 $3
 
-pushd expat-2.1.0
+pushd expat-2.2.1
 
 make clean
 
diff --git a/ffmpeg b/ffmpeg
index fda00aa..6d7192b 160000
--- a/ffmpeg
+++ b/ffmpeg
@@ -1 +1 @@
-Subproject commit fda00aa7749326f02a6ca0a7d9bd9bcda1054071
+Subproject commit 6d7192bcb7bbab17dc194e8dbb56c208bced0a92
diff --git a/ffmpeg_build.sh b/ffmpeg_build.sh
index 2bc85be..f105596 100755
--- a/ffmpeg_build.sh
+++ b/ffmpeg_build.sh
@@ -2,7 +2,9 @@
 
 . abi_settings.sh $1 $2 $3
 
-pushd ffmpeg
+oot="${2}/build/${1}/oot/ffmpeg"
+mkdir -p "$oot"
+pushd "$oot"
 
 case $1 in
   armeabi-v7a | armeabi-v7a-neon)
@@ -13,9 +15,9 @@ case $1 in
   ;;
 esac
 
-make clean
+make distclean
 
-./configure \
+"${2}/ffmpeg/configure" \
 --target-os="$TARGET_OS" \
 --cross-prefix="$CROSS_PREFIX" \
 --arch="$NDK_ABI" \
@@ -37,7 +39,7 @@ make clean
 --disable-ffplay \
 --disable-ffprobe \
 --enable-gpl \
---enable-yasm \
+--disable-asm \
 --disable-doc \
 --disable-shared \
 --enable-static \
diff --git a/fontconfig b/fontconfig
index 1827ef7..690f822 160000
--- a/fontconfig
+++ b/fontconfig
@@ -1 +1 @@
-Subproject commit 1827ef7b1e0a1fba27fcdb8a021abaa8ee7782eb
+Subproject commit 690f822a1b26b089d86e9843746cab80f3c07fe3
diff --git a/freetype2 b/freetype2
index 44accb9..a12a344 160000
--- a/freetype2
+++ b/freetype2
@@ -1 +1 @@
-Subproject commit 44accb9e2e5b00696cf50a869b68afa2ce3dd389
+Subproject commit a12a34451a99cbbcad55d466940fd445171927fd
diff --git a/init_update_libs.sh b/init_update_libs.sh
index 5e82329..7ccd767 100755
--- a/init_update_libs.sh
+++ b/init_update_libs.sh
@@ -2,7 +2,7 @@
 
 echo "============================================"
 echo "Updating submodules"
-git submodule update --init
+git submodule update --init || exit 1
 echo "============================================"
 echo "Updating libpng, expat and fribidi"
 rm -rf libpng-*
@@ -10,8 +10,8 @@ rm -rf expat-*
 rm -rf fribidi-*
 rm -rf lame-*
 
-wget -O- ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng16/libpng-1.6.21.tar.xz | tar xJ
-wget -O- http://downloads.sourceforge.net/project/expat/expat/2.1.0/expat-2.1.0.tar.gz | tar xz
-wget -O- http://fribidi.org/download/fribidi-0.19.7.tar.bz2 | tar xj
-wget -O- http://sourceforge.net/projects/lame/files/lame/3.99/lame-3.99.5.tar.gz | tar xz
+wget -O- ftp://ftp-osl.osuosl.org/pub/libpng/src/libpng16/libpng-1.6.30.tar.xz | tar xJ || exit 1
+wget -O- http://downloads.sourceforge.net/project/expat/expat/2.2.1/expat-2.2.1.tar.bz2 | tar xj || exit 1
+wget -O- http://fribidi.org/download/fribidi-0.19.7.tar.bz2 | tar xj || exit 1
+wget -O- http://sourceforge.net/projects/lame/files/lame/3.99/lame-3.99.5.tar.gz | tar xz || exit 1
 echo "============================================"
diff --git a/libass b/libass
index 7c30fea..9fb3840 160000
--- a/libass
+++ b/libass
@@ -1 +1 @@
-Subproject commit 7c30feaa6906c5f392f6a1496462504b09fd8df0
+Subproject commit 9fb384014e6d5205a6e30bc3a217e7edae4068a2
diff --git a/libpng_build.sh b/libpng_build.sh
index a5d75dd..b40db58 100755
--- a/libpng_build.sh
+++ b/libpng_build.sh
@@ -2,7 +2,7 @@
 
 . abi_settings.sh $1 $2 $3
 
-pushd libpng-1.6.21
+pushd libpng-1.6.30
 
 make clean
 
diff --git a/settings.sh b/settings.sh
index bdf7b94..006ed3a 100755
--- a/settings.sh
+++ b/settings.sh
@@ -1,17 +1,17 @@
 #!/bin/bash
 
-SUPPORTED_ARCHITECTURES=(armeabi-v7a armeabi-v7a-neon x86)
+SUPPORTED_ARCHITECTURES=(armeabi-v7a x86)
 ANDROID_NDK_ROOT_PATH=${ANDROID_NDK}
 if [[ -z "$ANDROID_NDK_ROOT_PATH" ]]; then
   echo "You need to set ANDROID_NDK environment variable, please check instructions"
   exit
 fi
-ANDROID_API_VERSION=9
-NDK_TOOLCHAIN_ABI_VERSION=4.8
+ANDROID_API_VERSION=14
+NDK_TOOLCHAIN_ABI_VERSION=4.9
 
 NUMBER_OF_CORES=$(nproc)
 HOST_UNAME=$(uname -m)
-TARGET_OS=linux
+TARGET_OS=android
 
 CFLAGS='-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fno-strict-overflow -fstack-protector-all'
 LDFLAGS='-Wl,-z,relro -Wl,-z,now -pie'
diff --git a/x264 b/x264
index 5c65704..aaa9aa8 160000
--- a/x264
+++ b/x264
@@ -1 +1 @@
-Subproject commit 5c6570495f8f1c716b294aee1430d8766a4beb9c
+Subproject commit aaa9aa83a111ed6f1db253d5afa91c5fc844583f