diff --git a/taskcluster/scripts/misc/wrench-android-build.sh b/taskcluster/scripts/misc/wrench-android-build.sh
index a194bd8e8ebc..a7e148af9bc8 100755
--- a/taskcluster/scripts/misc/wrench-android-build.sh
+++ b/taskcluster/scripts/misc/wrench-android-build.sh
@@ -7,11 +7,31 @@ mv wrench-deps/{vendor,.cargo,cargo-apk} gfx/wr
 popd
 
 pushd "${GECKO_PATH}/gfx/wr/wrench"
+# The following maven links are equivalent to GRADLE_MAVEN_REPOSITORIES, try
+# and keep in sync
+cat > build.gradle.inc <<END
+buildscript {
+    repositories {
+        maven{ url uri('file:${GECKO_PATH}/android-gradle-dependencies/google') }
+        maven{ url uri('file:${GECKO_PATH}/android-gradle-dependencies/jcenter') }
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.1.4'
+    }
+}
+allprojects {
+    repositories {
+        maven{ url uri('file:${GECKO_PATH}/android-gradle-dependencies/google') }
+        maven{ url uri('file:${GECKO_PATH}/android-gradle-dependencies/jcenter') }
+    }
+}
+END
 # These things come from the toolchain dependencies of the job that invokes
 # this script (webrender-wrench-android-build).
-export PATH="${PATH}:${GECKO_PATH}/rustc/bin:${GECKO_PATH}/android-gradle-dependencies/gradle-dist/bin"
 export PATH="${PATH}:${GECKO_PATH}/rustc/bin"
 export ANDROID_HOME="${GECKO_PATH}/android-sdk-linux"
 export NDK_HOME="${GECKO_PATH}/android-ndk"
+export CARGO_APK_GRADLE_COMMAND="${GECKO_PATH}/android-gradle-dependencies/gradle-dist/bin/gradle"
+export CARGO_APK_BUILD_GRADLE_INC="${PWD}/build.gradle.inc"
 ../cargo-apk/bin/cargo-apk build --frozen --verbose
 popd
diff --git a/taskcluster/scripts/misc/wrench-deps-vendoring.sh b/taskcluster/scripts/misc/wrench-deps-vendoring.sh
index 7d73fc2788de..54e2abf02ca6 100755
--- a/taskcluster/scripts/misc/wrench-deps-vendoring.sh
+++ b/taskcluster/scripts/misc/wrench-deps-vendoring.sh
@@ -22,10 +22,11 @@ mv vendor .cargo wrench-deps/
 mkdir wrench-deps/cargo-apk
 # Until there's a version of cargo-apk published on crates.io that has
 # https://github.com/tomaka/android-rs-glue/pull/205 and
+# https://github.com/tomaka/android-rs-glue/pull/207 and
 # https://github.com/tomaka/android-rs-glue/pull/171 (see also
 # https://github.com/tomaka/android-rs-glue/issues/204), we need to use
 # an unpublished version.
-cargo install --git https://github.com/staktrace/android-rs-glue --rev 6b2be25bd536a453e233cd7aea9d22974db63a49 --root wrench-deps/cargo-apk cargo-apk
+cargo install --git https://github.com/staktrace/android-rs-glue --rev 486491e81819c3346d364a93fc1f3c0206d3ece0 --root wrench-deps/cargo-apk cargo-apk
 tar caf wrench-deps.tar.bz2 wrench-deps
 
 mkdir -p $UPLOAD_DIR