diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 360a53239c7..fc3509ccfd0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -376,7 +376,7 @@ debian/android_build:
   extends:
     - .use-debian/x86_build-base
   variables:
-    MESA_IMAGE_TAG: &debian-android_build "2021-10-02-bump-libdrm-3"
+    MESA_IMAGE_TAG: &debian-android_build "2021-10-02-libelf-2"
 
 .use-debian/android_build:
   extends:
diff --git a/.gitlab-ci/container/debian/android_build.sh b/.gitlab-ci/container/debian/android_build.sh
index 45f75e1eb1f..54ec8cff6d7 100644
--- a/.gitlab-ci/container/debian/android_build.sh
+++ b/.gitlab-ci/container/debian/android_build.sh
@@ -3,6 +3,7 @@
 set -ex
 
 EPHEMERAL="\
+         autoconf \
          rdfind \
          unzip \
          "
@@ -58,4 +59,48 @@ done
 
 rm -rf $LIBDRM_VERSION
 
+export LIBELF_VERSION=libelf-0.8.13
+wget https://fossies.org/linux/misc/old/$LIBELF_VERSION.tar.gz
+
+# Not 100% sure who runs the mirror above so be extra careful
+if ! echo "4136d7b4c04df68b686570afa26988ac ${LIBELF_VERSION}.tar.gz" | md5sum -c -; then
+    echo "Checksum failed"
+    exit 1
+fi
+
+tar -xf ${LIBELF_VERSION}.tar.gz
+cd $LIBELF_VERSION
+
+# Work around a bug in the original configure not enabling __LIBELF64.
+autoreconf
+
+for arch in \
+        x86_64-linux-android \
+        i686-linux-android \
+        aarch64-linux-android \
+        arm-linux-androideabi ; do
+
+    ccarch=${arch}
+    if [ "${arch}" ==  'arm-linux-androideabi' ]
+    then
+       ccarch=armv7a-linux-androideabi
+    fi
+
+    export CC=/android-ndk-r21d/toolchains/llvm/prebuilt/linux-x86_64/bin/${arch}-ar
+    export CC=/android-ndk-r21d/toolchains/llvm/prebuilt/linux-x86_64/bin/${ccarch}29-clang
+    export CXX=/android-ndk-r21d/toolchains/llvm/prebuilt/linux-x86_64/bin/${ccarch}29-clang++
+    export LD=/android-ndk-r21d/toolchains/llvm/prebuilt/linux-x86_64/bin/${arch}-ld
+    export RANLIB=/android-ndk-r21d/toolchains/llvm/prebuilt/linux-x86_64/bin/${arch}-ranlib
+
+    # The configure script doesn't know about android, but doesn't really use the host anyway it
+    # seems
+    ./configure --host=x86_64-linux-gnu  --disable-nls --disable-shared \
+                --libdir=/usr/local/lib/${arch}
+    make install
+    make distclean
+done
+
+cd ..
+rm -rf $LIBELF_VERSION
+
 apt-get purge -y $EPHEMERAL