diff --git a/docker/Dockerfile b/docker/Dockerfile
index fc0126f5df921fb9051f6bb395a37050c5e7ab42..fa18291f2d5525035ac269dfea3780a415802b5f 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -36,34 +36,31 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 	zip \
 	&& locale-gen $LANG $LC_ALL && update-locale $LANG $LC_ALL
 
-ENV ANDROID_DEPS=\
-'platform-tools \
- build-tools;25.0.2 \
- platforms;android-25 \
- extras;android;m2repository \
- extras;google;m2repository'
-
-# Android Linux SDK tools
-# See http://developer.android.com/sdk/index.html
-RUN wget -O /tmp/android-tools.zip https://dl.google.com/android/repository/tools_r25.2.3-linux.zip && \
+# Android SDK tools
+RUN wget -O /tmp/android-tools.zip https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip && \
 	mkdir -p /opt/android-sdk && \
 	unzip -d /opt/android-sdk /tmp/android-tools.zip && \
 	rm -f /tmp/android-tools.zip && \
 	chown -R root:root /opt/android-sdk
-
-# Android Linux NDK
-# See http://developer.android.com/tools/sdk/ndk/index.html
-RUN wget -O /tmp/android-ndk.zip https://dl.google.com/android/repository/android-ndk-r14-linux-x86_64.zip && \
-	unzip /tmp/android-ndk.zip -d /opt/ && \
-	rm -f /tmp/android-ndk.zip && \
-	chown -R root:root /opt/android-ndk-r14
-
-# Other tools and resources of Android SDK
 ENV ANDROID_HOME=/opt/android-sdk
-ENV ANDROID_SDK=/opt/android-sdk
-ENV ANDROID_NDK=/opt/android-ndk-r14
-ENV PATH=${PATH}:${ANDROID_HOME}/tools/bin:${ANDROID_HOME}/platform-tools
+ENV PATH=${PATH}:${ANDROID_HOME}/tools/bin
+RUN (while sleep 1; do echo "y"; done) | sdkmanager --update
+
+# Android SDK libraries, NDK
+ENV ANDROID_DEPS=\
+'build-tools;25.0.3 \
+ platforms;android-25 \
+ extras;android;m2repository \
+ extras;google;m2repository \
+ ndk-bundle'
 RUN (while sleep 1; do echo "y"; done) | sdkmanager $ANDROID_DEPS
+ENV ANDROID_SDK=/opt/android-sdk
+ENV ANDROID_NDK=/opt/android-sdk/ndk-bundle
+
+# Gas-preprocessor (for ffmpeg ASM)
+RUN wget https://raw.githubusercontent.com/FFmpeg/gas-preprocessor/master/gas-preprocessor.pl && \
+	chmod a+x gas-preprocessor.pl && \
+	mv gas-preprocessor.pl /usr/bin
 
 WORKDIR /home/builder/src
 VOLUME /home/builder/src
diff --git a/ring-android/app/build.gradle b/ring-android/app/build.gradle
index 5e6579e5bc6c712f503ba908cb5386adc98b0527..b1fc0a739f08556429e313d8c2f0a54a2b19de77 100644
--- a/ring-android/app/build.gradle
+++ b/ring-android/app/build.gradle
@@ -45,7 +45,7 @@ dependencies {
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    buildToolsVersion "25.0.3"
 
     defaultConfig {
         minSdkVersion 16