diff --git a/.travis.yml b/.travis.yml
index cf6c930..361df3e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,4 +17,4 @@ install:
   - curl http://archive.ubuntu.com/ubuntu/pool/universe/n/nasm/nasm_2.14.02-1_amd64.deb --output $HOME/nasm_2.14.02-1_amd64.deb
   - sudo dpkg -i $HOME/nasm_2.14.02-1_amd64.deb
 script:
-  - bash -e ffmpeg-android-maker.sh --enable-libdav1d --enable-libmp3lame --enable-libaom --android-api-level=18
+  - bash -e ffmpeg-android-maker.sh --enable-libdav1d --enable-libmp3lame --enable-libaom
diff --git a/scripts/ffmpeg/build.sh b/scripts/ffmpeg/build.sh
index 87e4e4d..603d79c 100755
--- a/scripts/ffmpeg/build.sh
+++ b/scripts/ffmpeg/build.sh
@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 
 case $ANDROID_ABI in
+  armeabi-v7a)
+    EXTRA_BUILD_CONFIGURATION_FLAGS=--enable-thumb
+    ;;
   x86)
     # Disabling assembler optimizations, because they have text relocations
     EXTRA_BUILD_CONFIGURATION_FLAGS=--disable-asm
@@ -21,6 +24,9 @@ done
 DEP_CFLAGS="-I${BUILD_DIR_EXTERNAL}/${ANDROID_ABI}/include"
 DEP_LD_FLAGS="-L${BUILD_DIR_EXTERNAL}/${ANDROID_ABI}/lib $FFMPEG_EXTRA_LD_FLAGS"
 
+# Everything that goes below ${EXTRA_BUILD_CONFIGURATION_FLAGS} is my project-specific.
+# You are free to enable/disable whatever you actually need.
+
 ./configure \
   --prefix=${BUILD_DIR_FFMPEG}/${ANDROID_ABI} \
   --enable-cross-compile \
@@ -35,6 +41,19 @@ DEP_LD_FLAGS="-L${BUILD_DIR_EXTERNAL}/${ANDROID_ABI}/lib $FFMPEG_EXTRA_LD_FLAGS"
   --disable-static \
   --pkg-config=$(which pkg-config) \
   ${EXTRA_BUILD_CONFIGURATION_FLAGS} \
+  --disable-runtime-cpudetect \
+  --disable-programs \
+  --disable-muxers \
+  --disable-encoders \
+  --disable-avdevice \
+  --disable-postproc \
+  --disable-swresample \
+  --disable-avfilter \
+  --disable-doc \
+  --disable-debug \
+  --disable-pthreads \
+  --disable-network \
+  --disable-bsfs \
   $ADDITIONAL_COMPONENTS
 
 ${MAKE_EXECUTABLE} clean
diff --git a/scripts/libaom/build.sh b/scripts/libaom/build.sh
index 75ff651..723e3c2 100755
--- a/scripts/libaom/build.sh
+++ b/scripts/libaom/build.sh
@@ -12,6 +12,7 @@ ${CMAKE_EXECUTABLE} .. \
  -DCMAKE_TOOLCHAIN_FILE=${SCRIPTS_DIR}/libaom/android.cmake \
  -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} \
  -DCONFIG_PIC=1 \
+ -DCONFIG_AV1_ENCODER=0 \
  -DCONFIG_RUNTIME_CPU_DETECT=0 \
  -DENABLE_TESTS=0 \
  -DENABLE_DOCS=0 \