diff --git a/metadata/org.videolan.vlc.txt b/metadata/org.videolan.vlc.txt
index d98e4f119d..a43724f3d8 100644
--- a/metadata/org.videolan.vlc.txt
+++ b/metadata/org.videolan.vlc.txt
@@ -1215,39 +1215,57 @@ Build:2.1.4,12000609
         ./compile release
     ndk=r14
 
-Build:2.1.15,12011504
-    disable=contrib make failed
-    commit=2.1.15
+Build:2.1.20,12012004
+    commit=2.1.20
     subdir=vlc-android
+    sudo=apt-get -y install g++ ragel
+    init=echo y | $$SDK$$/tools/bin/sdkmanager 'build-tools;26.0.1'
     gradle=VanillaARMv7
-    srclibs=VLC@bdb4031
+    srclibs=VLC@6c643e6
     prebuild=ln -s vlc-android/$$VLC$$ ../vlc && \
+        sed -i -e '/^\.libarchive/a\\t$(RECONF)' ../vlc/contrib/src/libarchive/rules.mak && \
+        sed -i -e 's/git reset --hard ${TESTED_HASH}/true/' ../compile.sh && \
         sed -i -e '/signingConfig/d' build.gradle
     build=cd .. && \
+        mkdir -p gradle/wrapper && \
+        echo 'gradle "$@"' > gradlew && \
+        chmod a+x gradlew && \
         ./compile.sh -a arm release
     ndk=r14b
 
-Build:2.1.15,12011505
-    disable=contrib make failed
-    commit=2.1.15
+Build:2.1.20,12012005
+    commit=2.1.20
     subdir=vlc-android
+    sudo=apt-get -y install g++ ragel
+    init=echo y | $$SDK$$/tools/bin/sdkmanager 'build-tools;26.0.1'
     gradle=VanillaX86
-    srclibs=VLC@bdb4031
+    srclibs=VLC@6c643e6
     prebuild=ln -s vlc-android/$$VLC$$ ../vlc && \
+        sed -i -e '/^\.libarchive/a\\t$(RECONF)' ../vlc/contrib/src/libarchive/rules.mak && \
+        sed -i -e 's/git reset --hard ${TESTED_HASH}/true/' ../compile.sh && \
         sed -i -e '/signingConfig/d' build.gradle
     build=cd .. && \
+        mkdir -p gradle/wrapper && \
+        echo 'gradle "$@"' > gradlew && \
+        chmod a+x gradlew && \
         ./compile.sh -a x86 release
     ndk=r14b
 
-Build:2.1.15,12011507
-    disable=contrib make failed
-    commit=2.1.15
+Build:2.1.20,12012007
+    commit=2.1.20
     subdir=vlc-android
+    sudo=apt-get -y install g++ ragel
+    init=echo y | $$SDK$$/tools/bin/sdkmanager 'build-tools;26.0.1'
     gradle=VanillaARMv8
-    srclibs=VLC@bdb4031
+    srclibs=VLC@6c643e6
     prebuild=ln -s vlc-android/$$VLC$$ ../vlc && \
+        sed -i -e '/^\.libarchive/a\\t$(RECONF)' ../vlc/contrib/src/libarchive/rules.mak && \
+        sed -i -e 's/git reset --hard ${TESTED_HASH}/true/' ../compile.sh && \
         sed -i -e '/signingConfig/d' build.gradle
     build=cd .. && \
+        mkdir -p gradle/wrapper && \
+        echo 'gradle "$@"' > gradlew && \
+        chmod a+x gradlew && \
         ./compile.sh -a arm64 release
     ndk=r14b
 
@@ -1257,7 +1275,7 @@ see http://buildbot.videolan.org/builders /for version code scheme
 The VLC srclib commit can be found out from TESTED_HASH value in compile.sh
 
 For recommended versions of the build tools, see:
-https://git.videolan.org/?p=vlc.git;a=blob;f=extras/tools/bootstrap;h=e60e5ebf93e69e7bb731e80d0fbc6ebd1226dfdb;hb=HEAD#l73
+https://git.videolan.org/?p=vlc.git;a=blob;f=extras/tools/bootstrap#l72
 
 Actual versioncodes are:
 
@@ -1283,5 +1301,5 @@ resign official apks:
 Archive Policy:0 versions
 Auto Update Mode:None
 Update Check Mode:Static
-Current Version:2.1.15
-Current Version Code:12011507
+Current Version:2.1.20
+Current Version Code:12012007