diff --git a/metadata/app.openconnect.txt b/metadata/app.openconnect.txt
index 66aa16978b..a4917bc9d8 100644
--- a/metadata/app.openconnect.txt
+++ b/metadata/app.openconnect.txt
@@ -119,7 +119,6 @@ Build:1.11,1119
         cp $$ACRA$$/target/acra-4.5.0.jar libs/ && \
         make -C external/openconnect/android sources
     build=make -C external NDK=$$NDK$$
-    ndk=r10e
 
 Maintainer Notes:
 TODO: libs/openconnect-wrapper.jar
diff --git a/metadata/com.collabora.libreoffice.txt b/metadata/com.collabora.libreoffice.txt
index ba6e9fb890..a406b36c44 100644
--- a/metadata/com.collabora.libreoffice.txt
+++ b/metadata/com.collabora.libreoffice.txt
@@ -33,7 +33,6 @@ Build:4.5.0.0.alpha0+/7f68f67,6
     commit=7f68f67
     disable=Remove old alpha build
     srclibs=LOTarballs@c873ae6f
-    ndk=r10e
     output=android/experimental/LOAndroid3/bin/LibreOfficeViewer-release-unsigned.apk
     prebuild=sed -i -e 's/\/$(OOO_VENDOR)//g' android/Bootstrap/Makefile.shared && \
         sed -i -e 's/test_fontconfig=yes/test_fontconfig=no/g' configure.ac && \
@@ -46,7 +45,6 @@ Build:4.5.0.0.alpha0+/3f1713b,7
     commit=3f1713b
     srclibs=LOTarballs@c873ae6f
     output=android/experimental/LOAndroid3/bin/LibreOfficeViewer-release-unsigned.apk
-    ndk=r10e
     prebuild=sed -i -e 's/\/$(OOO_VENDOR)//g' android/Bootstrap/Makefile.shared && \
         sed -i -e 's/test_fontconfig=yes/test_fontconfig=no/g' configure.ac && \
         sed -i -e 's/test_freetype=yes/test_freetype=no/g' configure.ac
@@ -57,7 +55,6 @@ Build:4.5.0.0.alpha0+/3f1713b,7
 Build:4.5.0.0.alpha0+/3f1713b,8
     commit=3f1713b
     srclibs=LOTarballs@c873ae6f
-    ndk=r10e
     output=android/experimental/LOAndroid3/bin/LibreOfficeViewer-release-unsigned.apk
     prebuild=sed -i -e 's/\/$(OOO_VENDOR)//g' android/Bootstrap/Makefile.shared && \
         sed -i -e 's/test_fontconfig=yes/test_fontconfig=no/g' configure.ac && \
@@ -70,7 +67,6 @@ Build:4.5.0.0.alpha0+/2f6bc9c,9
     commit=2f6bc9c
     srclibs=LOTarballs@c873ae6f
     output=android/experimental/LOAndroid3/bin/LibreOfficeViewer-release-unsigned.apk
-    ndk=r10e
     prebuild=sed -i -e 's/\/$(OOO_VENDOR)//g' android/Bootstrap/Makefile.shared && \
         sed -i -e 's/test_fontconfig=yes/test_fontconfig=no/g' configure.ac && \
         sed -i -e 's/test_freetype=yes/test_freetype=no/g' configure.ac
@@ -81,7 +77,6 @@ Build:4.5.0.0.alpha0+/2f6bc9c,9
 Build:4.5.0.0.alpha0+/2f6bc9c,10
     commit=2f6bc9c
     srclibs=LOTarballs@c873ae6f
-    ndk=r10e
     output=android/experimental/LOAndroid3/bin/LibreOfficeViewer-release-unsigned.apk
     prebuild=sed -i -e 's/\/$(OOO_VENDOR)//g' android/Bootstrap/Makefile.shared && \
         sed -i -e 's/test_fontconfig=yes/test_fontconfig=no/g' configure.ac && \
@@ -93,7 +88,6 @@ Build:4.5.0.0.alpha0+/2f6bc9c,10
 Build:4.5.0.0.alpha0+/2d6e16f,11
     commit=2d6e16f
     srclibs=LOTarballs@187cf421
-    ndk=r10e
     output=android/experimental/LOAndroid3/bin/LibreOfficeViewer-release-unsigned.apk
     prebuild=sed -i -e 's/\/$(OOO_VENDOR)//g' android/Bootstrap/Makefile.shared && \
         sed -i -e 's/test_fontconfig=yes/test_fontconfig=no/g' configure.ac && \
@@ -108,7 +102,6 @@ Build:4.5.0.0.alpha0+/2d6e16f,11
 Build:4.5.0.0.alpha0+/2d6e16f,12
     commit=2d6e16f
     srclibs=LOTarballs@187cf421
-    ndk=r10e
     output=android/experimental/LOAndroid3/bin/LibreOfficeViewer-release-unsigned.apk
     prebuild=sed -i -e 's/\/$(OOO_VENDOR)//g' android/Bootstrap/Makefile.shared && \
         sed -i -e 's/test_fontconfig=yes/test_fontconfig=no/g' configure.ac && \
diff --git a/metadata/com.csipsimple.txt b/metadata/com.csipsimple.txt
index 43912a3bd5..730190973d 100644
--- a/metadata/com.csipsimple.txt
+++ b/metadata/com.csipsimple.txt
@@ -59,7 +59,6 @@ Build:1.02.03-2459,2459
         cp -r $$webrtc$$ jni/webrtc/sources && \
         cp -r $$libyuv$$ jni/third_party/libyuv
     scanignore=CSipSimple/jni/webrtc/sources/modules/video_capture/main/source/android/java/org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid.java,CSipSimple/src/org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid.java
-    ndk=r10e
     build=PATH=$PATH:$$NDK$$ make NDK_ROOT=$$NDK$$
     buildjni=no
 
diff --git a/metadata/com.eolwral.osmonitor.txt b/metadata/com.eolwral.osmonitor.txt
index 11e15b85b7..7f502a11cc 100644
--- a/metadata/com.eolwral.osmonitor.txt
+++ b/metadata/com.eolwral.osmonitor.txt
@@ -232,7 +232,6 @@ Build:3.4.0.9,81
         mv libs/armeabi/osmcore_pie assets/osmcore_arm_pie && \
         mv libs/mips/osmcore_pie assets/osmcore_mips_pie && \
         mv libs/x86/osmcore_pie assets/osmcore_x86_pie
-    ndk=r10e
 
 Build:3.4.1.0,82
     commit=862a43b84acf3c335e2ea71f946cc2ab60bca79c
@@ -253,7 +252,6 @@ Build:3.4.1.0,82
         mv libs/armeabi/osmcore_pie assets/osmcore_arm_pie && \
         mv libs/mips/osmcore_pie assets/osmcore_mips_pie && \
         mv libs/x86/osmcore_pie assets/osmcore_x86_pie
-    ndk=r10e
 
 Auto Update Mode:None
 Update Check Mode:RepoManifest
diff --git a/metadata/com.googlecode.gogodroid.txt b/metadata/com.googlecode.gogodroid.txt
index 3e3c1daca5..088603007e 100644
--- a/metadata/com.googlecode.gogodroid.txt
+++ b/metadata/com.googlecode.gogodroid.txt
@@ -37,7 +37,6 @@ Build:2.0,20
 
 Build:2.1,21
     commit=2.1
-    ndk=r10e
     build=cd gogoc-android && \
         $$NDK$$/ndk-build && \
         cp -a libs/ ../assets
diff --git a/metadata/com.haha01haha01.harail.txt b/metadata/com.haha01haha01.harail.txt
index ab43931b6e..65def3cc56 100644
--- a/metadata/com.haha01haha01.harail.txt
+++ b/metadata/com.haha01haha01.harail.txt
@@ -29,7 +29,6 @@ Build:1.0,1
     extlibs=commons-net/commons-net-3.0.1.jar,android/android-support-v4.jar
     target=android-22
     buildjni=yes
-    ndk=r10e
 
 Auto Update Mode:Version %v
 Update Check Mode:Tags
diff --git a/metadata/com.howeyc.spiped.txt b/metadata/com.howeyc.spiped.txt
index 561b4be05e..e0425d978d 100644
--- a/metadata/com.howeyc.spiped.txt
+++ b/metadata/com.howeyc.spiped.txt
@@ -37,7 +37,6 @@ Build:1.3,4
     commit=e316c9d3263f57539e55b22f74d37d7449212835
     subdir=android_studio_app/Spiped/app
     gradle=yes
-    ndk=r10e
 
 Auto Update Mode:None
 Update Check Mode:RepoManifest
diff --git a/metadata/com.mitzuli.txt b/metadata/com.mitzuli.txt
index 02667624fd..31e2ffabea 100644
--- a/metadata/com.mitzuli.txt
+++ b/metadata/com.mitzuli.txt
@@ -26,7 +26,6 @@ Build:1.0.2,10002
         sed -i -e '/splits/,+7d' build.gradle && \
         echo 'ndkdir=$$NDK$$' > ../gradle.properties
     scanignore=app/src/main/java/com/mitzuli/core/mt/MtPackage.java
-    ndk=r10e
 
 #universal apk
 Build:1.0.3,10003
@@ -37,7 +36,6 @@ Build:1.0.3,10003
         sed -i -e '/splits/,+7d' build.gradle && \
         echo 'ndkdir=$$NDK$$' > ../gradle.properties
     scanignore=app/src/main/java/com/mitzuli/core/mt/MtPackage.java
-    ndk=r10e
 
 #universal apk
 Build:1.0.4,10004
@@ -48,7 +46,6 @@ Build:1.0.4,10004
         sed -i -e '/splits/,+7d' build.gradle && \
         echo 'ndkdir=$$NDK$$' > ../gradle.properties
     scanignore=app/src/main/java/com/mitzuli/core/mt/MtPackage.java
-    ndk=r10e
 
 #universal apk
 Build:1.0.5,10005
@@ -59,7 +56,6 @@ Build:1.0.5,10005
         sed -i -e '/splits/,+7d' build.gradle && \
         echo 'ndkdir=$$NDK$$' > ../gradle.properties
     scanignore=app/src/main/java/com/mitzuli/core/mt/MtPackage.java
-    ndk=r10e
 
 Build:1.0.3,1010003
     disable=split
@@ -69,7 +65,6 @@ Build:1.0.3,1010003
     prebuild=sed -i -e 's/universalApk true/universalApk false/g' build.gradle && \
         echo 'ndkdir=$$NDK$$' > ../gradle.properties
     scanignore=app/src/main/java/com/mitzuli/core/mt/MtPackage.java
-    ndk=r10e
 
 Build:1.0.3,2010003
     disable=split
@@ -79,7 +74,6 @@ Build:1.0.3,2010003
     prebuild=sed -i -e 's/universalApk true/universalApk false/g' build.gradle && \
         echo 'ndkdir=$$NDK$$' > ../gradle.properties
     scanignore=app/src/main/java/com/mitzuli/core/mt/MtPackage.java
-    ndk=r10e
 
 Build:1.0.3,3010003
     disable=split
@@ -89,7 +83,6 @@ Build:1.0.3,3010003
     prebuild=sed -i -e 's/universalApk true/universalApk false/g' build.gradle && \
         echo 'ndkdir=$$NDK$$' > ../gradle.properties
     scanignore=app/src/main/java/com/mitzuli/core/mt/MtPackage.java
-    ndk=r10e
 
 Build:1.0.3,4010003
     disable=split
@@ -99,7 +92,6 @@ Build:1.0.3,4010003
     prebuild=sed -i -e 's/universalApk true/universalApk false/g' build.gradle && \
         echo 'ndkdir=$$NDK$$' > ../gradle.properties
     scanignore=app/src/main/java/com/mitzuli/core/mt/MtPackage.java
-    ndk=r10e
 
 Maintainer Notes:
 1.0.3 can be build using ABI splits, however all ABIs are built on each run,
diff --git a/metadata/com.opendoorstudios.ds4droid.txt b/metadata/com.opendoorstudios.ds4droid.txt
index ea114cebec..68774b3a2a 100644
--- a/metadata/com.opendoorstudios.ds4droid.txt
+++ b/metadata/com.opendoorstudios.ds4droid.txt
@@ -157,7 +157,6 @@ Build:46,461
     scandelete=jni/desmume
     rm=libs/ouya-sdk.jar
     buildjni=yes
-    ndk=r10e
 
 Build:46,463
     commit=release46
@@ -169,7 +168,6 @@ Build:46,463
     scandelete=jni/desmume
     rm=libs/ouya-sdk.jar
     buildjni=yes
-    ndk=r10e
 
 # +0: - (upstream)
 # +1: x86
diff --git a/metadata/com.roguetemple.hyperroid.txt b/metadata/com.roguetemple.hyperroid.txt
index 9bd8e39666..6d61cd33c1 100644
--- a/metadata/com.roguetemple.hyperroid.txt
+++ b/metadata/com.roguetemple.hyperroid.txt
@@ -43,7 +43,6 @@ Build:5.5a,551
     subdir=app
     gradle=yes
     rm=app/src/main/jni/hyper
-    ndk=r10e
 
 Auto Update Mode:None
 Update Check Mode:RepoManifest
diff --git a/metadata/com.zoffcc.applications.zanavi.txt b/metadata/com.zoffcc.applications.zanavi.txt
index 6cd77e5cff..349751073a 100644
--- a/metadata/com.zoffcc.applications.zanavi.txt
+++ b/metadata/com.zoffcc.applications.zanavi.txt
@@ -18,7 +18,6 @@ Repo:https://github.com/zoff99/zanavi.git
 Build:2.0.40,240
     disable=broken upstream
     target=21
-    ndk=r10e
     commit=2ab763a86e8728c7200247f1cc4f57d6917a571e
     prebuild=echo '<project name="ZANavi"><target name="clean"/></project>' > build.xml && \
     mkdir -p po/lp/navit-orig-import && rm navit/maptool/poly2tri-c/001/seidel-1.0/triangulate && \
diff --git a/metadata/de.blinkt.openvpn.txt b/metadata/de.blinkt.openvpn.txt
index d99f3d68bc..cf85f9b000 100644
--- a/metadata/de.blinkt.openvpn.txt
+++ b/metadata/de.blinkt.openvpn.txt
@@ -130,7 +130,6 @@ Build:0.6.26,107
     gradle=normal
     build=./misc/build-native.sh USE_BREAKPAD=0
     buildjni=no
-    ndk=r10e
 
 Build:0.6.30,111
     commit=v0.6.30-production
@@ -139,7 +138,6 @@ Build:0.6.30,111
     gradle=normal
     build=./misc/build-native.sh USE_BREAKPAD=0
     buildjni=no
-    ndk=r10e
 
 Maintainer Notes:
 This has (as at 0.6.17) openssl 1.0.0e source code embedded in the source
diff --git a/metadata/de.ph1b.audiobook.txt b/metadata/de.ph1b.audiobook.txt
index 48013a6176..c9ac0f7d45 100644
--- a/metadata/de.ph1b.audiobook.txt
+++ b/metadata/de.ph1b.audiobook.txt
@@ -94,139 +94,116 @@ Build:1.5.3,28
     commit=v1.5.3
     subdir=audiobook
     gradle=yes
-    ndk=r10e
 
 Build:2.0-RC2,39
     commit=v2.0-fdroid
     subdir=audiobook
     gradle=yes
-    ndk=r10e
 
 Build:2.0.3,43
     commit=v2.0.3
     subdir=audiobook
     gradle=yes
-    ndk=r10e
 
 Build:2.0.4,44
     commit=v2.0.4
     subdir=audiobook
     gradle=yes
-    ndk=r10e
 
 Build:2.0.5,45
     commit=v2.0.5
     subdir=audiobook
     gradle=yes
-    ndk=r10e
 
 Build:2.0.7,47
     commit=v2.0.7
     subdir=audiobook
     gradle=yes
-    ndk=r10e
 
 Build:2.0.8,48
     commit=v2.0.8
     subdir=audiobook
     gradle=yes
-    ndk=r10e
 
 Build:2.0.9.1,50
     commit=v2.0.9.1
     subdir=audiobook
     gradle=yes
-    ndk=r10e
 
 Build:2.1.0,51
     commit=v2.1.0
     subdir=audiobook
     gradle=yes
-    ndk=r10e
 
 Build:2.1.1,52
     commit=v2.1.1
     subdir=audiobook
     gradle=yes
-    ndk=r10e
 
 Build:2.1.2.1,54
     commit=v2.1.2.1
     subdir=audiobook
     gradle=yes
-    ndk=r10e
 
 Build:2.1.3,56
     commit=v2.1.3
     subdir=audiobook
     gradle=yes
-    ndk=r10e
 
 Build:2.1.5,59
     commit=v2.1.5
     subdir=audiobook
     gradle=yes
-    ndk=r10e
 
 Build:2.1.6,60
     commit=v2.1.6
     subdir=audiobook
     gradle=yes
-    ndk=r10e
 
 Build:2.1.6.1,61
     commit=v2.1.6.1
     subdir=audiobook
     gradle=yes
-    ndk=r10e
 
 Build:2.1.7,62
     commit=v2.1.7
     subdir=audiobook
     gradle=yes
-    ndk=r10e
 
 Build:2.1.8,63
     commit=v2.1.8
     subdir=audiobook
     gradle=yes
-    ndk=r10e
 
 Build:2.1.9,64
     commit=v2.1.9
     subdir=audiobook
     gradle=yes
-    ndk=r10e
 
 Build:2.1.9.1,65
     commit=v2.1.9.1
     subdir=audiobook
     gradle=yes
-    ndk=r10e
 
 Build:2.2,66
     commit=v2.2
     subdir=audiobook
     gradle=yes
-    ndk=r10e
 
 Build:2.2.1,67
     commit=v2.2.1
     subdir=audiobook
     gradle=yes
-    ndk=r10e
 
 Build:2.2.2,68
     commit=v2.2.2
     subdir=audiobook
     gradle=yes
-    ndk=r10e
 
 Build:2.2.3.1,70
     commit=v2.2.3.1
     subdir=audiobook
     gradle=yes
-    ndk=r10e
 
 Auto Update Mode:Version v%v
 Update Check Mode:Tags ^v[0-9.]+?$
diff --git a/metadata/dev.ukanth.ufirewall.txt b/metadata/dev.ukanth.ufirewall.txt
index 988b86f727..6932a8d1de 100644
--- a/metadata/dev.ukanth.ufirewall.txt
+++ b/metadata/dev.ukanth.ufirewall.txt
@@ -265,7 +265,6 @@ Build:2.0.0-ALPHA-1,15200
     build=pushd .. && \
         export NDK_PROJECT_PATH=`pwd` && \
         make -C external NDK=$$NDK$$
-    ndk=r10e
 
 Build:2.0.0-ALPHA-2,15201
     commit=7f2ec4043412838d8f42d43839c060dd724a352a
@@ -276,7 +275,6 @@ Build:2.0.0-ALPHA-2,15201
     build=pushd .. && \
         export NDK_PROJECT_PATH=`pwd` && \
         make -C external NDK=$$NDK$$
-    ndk=r10e
 
 Build:2.0.0-BETA-1,15203
     disable=Bug in NDK r10e
@@ -288,7 +286,6 @@ Build:2.0.0-BETA-1,15203
     build=pushd .. && \
         export NDK_PROJECT_PATH=`pwd` && \
         make -C external NDK=$$NDK$$
-    ndk=r10e
 
 Build:2.0.0-BETA 2,15204
     commit=v2.0.0-BETA 2
@@ -299,7 +296,6 @@ Build:2.0.0-BETA 2,15204
     build=pushd .. && \
         export NDK_PROJECT_PATH=`pwd` && \
         make -C external NDK=$$NDK$$
-    ndk=r10e
 
 Auto Update Mode:Version v%v
 Update Check Mode:Tags
diff --git a/metadata/fr.ubordeaux.math.paridroid.txt b/metadata/fr.ubordeaux.math.paridroid.txt
index 1391e5ba30..5bcf9fc5a3 100644
--- a/metadata/fr.ubordeaux.math.paridroid.txt
+++ b/metadata/fr.ubordeaux.math.paridroid.txt
@@ -29,7 +29,6 @@ Build:2.7.2.1.3,8
     build=cd .. && \
         make pari
     buildjni=yes
-    ndk=r10e
 
 Build:2.7.3.1.3,9
     commit=2.7.3.1.3
@@ -40,7 +39,6 @@ Build:2.7.3.1.3,9
     build=cd .. && \
         make pari
     buildjni=yes
-    ndk=r10e
 
 Auto Update Mode:None
 Update Check Mode:Tags
diff --git a/metadata/info.guardianproject.pixelknot.txt b/metadata/info.guardianproject.pixelknot.txt
index 4caaa309fc..1959ff2464 100644
--- a/metadata/info.guardianproject.pixelknot.txt
+++ b/metadata/info.guardianproject.pixelknot.txt
@@ -26,7 +26,6 @@ Build:0.3.3,6
     target=android-22
     init=mv res/values-zh_TW res/values-zh-rTW && \
          mv res/values-nb_NO res/values-nb-rNO
-    ndk=r10e
 
 Auto Update Mode:None
 Update Check Mode:Tags
diff --git a/metadata/jackpal.androidterm.txt b/metadata/jackpal.androidterm.txt
index 6bb3334a30..3aa506f7a4 100644
--- a/metadata/jackpal.androidterm.txt
+++ b/metadata/jackpal.androidterm.txt
@@ -116,49 +116,41 @@ Build:1.0.63,64
     commit=v1.0.63
     subdir=term
     gradle=yes
-    ndk=r10e
 
 Build:1.0.64,65
     commit=v1.0.64
     subdir=term
     gradle=yes
-    ndk=r10e
 
 Build:1.0.65,66
     commit=v1.0.65
     subdir=term
     gradle=yes
-    ndk=r10e
 
 Build:1.0.66,67
     commit=v1.0.66
     subdir=term
     gradle=yes
-    ndk=r10e
 
 Build:1.0.67,68
     commit=v1.0.67
     subdir=term
     gradle=yes
-    ndk=r10e
 
 Build:1.0.68,69
     commit=v1.0.68
     subdir=term
     gradle=yes
-    ndk=r10e
 
 Build:1.0.69,70
     commit=v1.0.69
     subdir=term
     gradle=yes
-    ndk=r10e
 
 Build:1.0.70,71
     commit=v1.0.70
     subdir=term
     gradle=yes
-    ndk=r10e
 
 Auto Update Mode:Version v%v
 Update Check Mode:Tags
diff --git a/metadata/name.boyle.chris.sgtpuzzles.txt b/metadata/name.boyle.chris.sgtpuzzles.txt
index dd6be0c33c..41dd25a5f4 100644
--- a/metadata/name.boyle.chris.sgtpuzzles.txt
+++ b/metadata/name.boyle.chris.sgtpuzzles.txt
@@ -27,7 +27,6 @@ Build:2014-11-09-1643-4a8edc6,97
     commit=2014-11-09-1643-4a8edc6
     gradle=yes
     subdir=app
-    ndk=r10e
     forceversion=yes
 
 Maintainer Notes:
diff --git a/metadata/net.minetest.minetest.txt b/metadata/net.minetest.minetest.txt
index 7a2408403d..bd42c4f8be 100644
--- a/metadata/net.minetest.minetest.txt
+++ b/metadata/net.minetest.minetest.txt
@@ -31,7 +31,6 @@ Build:0.4.12.12,12
     subdir=build/android
     srclibs=MinetestGame@03c00a831d5c2fd37096449bee49557879068af1
     buildjni=no
-    ndk=r10e
     build=printf "%s\n%s\n%s" \
             "ANDROID_NDK = $$NDK$$" \
             "NDK_MODULE_PATH = $$NDK$$/toolchains" \
diff --git a/metadata/net.osmand.plus.txt b/metadata/net.osmand.plus.txt
index b189366156..7ed206ef13 100644
--- a/metadata/net.osmand.plus.txt
+++ b/metadata/net.osmand.plus.txt
@@ -126,7 +126,6 @@ Build:1.9.4,196
     output=bin/OsmAnd-release-unsigned.apk
     build=../../build
     buildjni=no
-    ndk=r10e
 
 Build:1.9.5,197
     commit=1.9.5
@@ -135,7 +134,6 @@ Build:1.9.5,197
     output=bin/OsmAnd-release-unsigned.apk
     build=../../build
     buildjni=no
-    ndk=r10e
 
 Build:2.0.2,201
     disable=builds and works, disable for further restructuring
@@ -146,7 +144,6 @@ Build:2.0.2,201
     build=../../build
     gradle=fullLegacyFat
     buildjni=no
-    ndk=r10e
 
 Build:2.0.3,205
     disable=builds with slow rendering
@@ -162,7 +159,6 @@ Build:2.0.3,205
         sed -i -e '/sourceSets/icompileOptions {\nsourceCompatibility = JavaVersion.VERSION_1_7\ntargetCompatibility = JavaVersion.VERSION_1_7\n}\n' ../eclipse-compile/appcompat/build.gradle build.gradle
     gradle=full,legacy,fat
     buildjni=no
-    ndk=r10e
 
 Build:2.0.4,206
     disable=builds with slow rendering
@@ -178,7 +174,6 @@ Build:2.0.4,206
         sed -i -e '/sourceSets/icompileOptions {\nsourceCompatibility = JavaVersion.VERSION_1_7\ntargetCompatibility = JavaVersion.VERSION_1_7\n}\n' ../eclipse-compile/appcompat/build.gradle build.gradle
     gradle=full,legacy,fat
     buildjni=no
-    ndk=r10e
 
 Build:2.0.4,207
     commit=6c290d170b00119df2771b1509221b46212947e9
@@ -194,7 +189,6 @@ Build:2.0.4,207
         sed -i -e '1 iAPP_PLATFORM := android-14' jni/Application.mk
     gradle=full,legacy,fat
     buildjni=no
-    ndk=r10e
 
 Build:2.1.1,212
     commit=2.1.1
@@ -208,7 +202,6 @@ Build:2.1.1,212
         sed -i -e "s/System.getenv(\"TARGET_APP_NAME\")/\"OsmAnd~\"/g" build.gradle
     gradle=full,legacy,fat
     buildjni=no
-    ndk=r10e
 
 Maintainer Notes:
 No UCMs apply because git never contains actual releases, only pre-releses.
diff --git a/metadata/nya.miku.wishmaster.txt b/metadata/nya.miku.wishmaster.txt
index 94c70c9f9b..0387412018 100644
--- a/metadata/nya.miku.wishmaster.txt
+++ b/metadata/nya.miku.wishmaster.txt
@@ -32,56 +32,48 @@ Build:1.0.3,18
     gradle=yes
     rm=libs/*,build.xml
     buildjni=no
-    ndk=r10e
 
 Build:1.0.4,19
     commit=v1.0.4
     gradle=yes
     rm=libs/*,build.xml
     buildjni=no
-    ndk=r10e
 
 Build:1.0.5,20
     commit=v1.0.5
     gradle=yes
     rm=libs/*,build.xml
     buildjni=no
-    ndk=r10e
 
 Build:1.0.6,21
     commit=v1.0.6
     gradle=yes
     rm=libs/*,build.xml
     buildjni=no
-    ndk=r10e
 
 Build:1.0.7,22
     commit=v1.0.7
     gradle=yes
     rm=libs/*,build.xml
     buildjni=no
-    ndk=r10e
 
 Build:1.1.0,23
     commit=v1.1.0
     gradle=yes
     rm=libs/*,build.xml
     buildjni=no
-    ndk=r10e
 
 Build:1.1.2,25
     commit=v1.1.2
     gradle=yes
     rm=libs/*,build.xml
     buildjni=no
-    ndk=r10e
 
 Build:1.1.4,27
     commit=v1.1.4
     gradle=yes
     rm=libs/*,build.xml
     buildjni=no
-    ndk=r10e
 
 Auto Update Mode:Version v%v
 Update Check Mode:Tags
diff --git a/metadata/org.billthefarmer.accordion.txt b/metadata/org.billthefarmer.accordion.txt
index caf5589db0..b0b72fda3e 100644
--- a/metadata/org.billthefarmer.accordion.txt
+++ b/metadata/org.billthefarmer.accordion.txt
@@ -51,14 +51,12 @@ Build:1.03,103
     scanignore=jni/libs
     scandelete=libs
     buildjni=yes
-    ndk=r10e
 
 Build:1.04,104
     commit=v1.04
     scanignore=jni/libs
     scandelete=libs
     buildjni=yes
-    ndk=r10e
 
 Maintainer Notes:
 As of version 1.03, does not require the convoluted build process used
diff --git a/metadata/org.billthefarmer.melodeon.txt b/metadata/org.billthefarmer.melodeon.txt
index fad5100afb..1589d7c4bb 100644
--- a/metadata/org.billthefarmer.melodeon.txt
+++ b/metadata/org.billthefarmer.melodeon.txt
@@ -51,14 +51,12 @@ Build:1.02,102
     scanignore=jni/libs
     scandelete=libs
     buildjni=yes
-    ndk=r10e
 
 Build:1.03,103
     commit=v1.03
     scanignore=jni/libs
     scandelete=libs
     buildjni=yes
-    ndk=r10e
 
 Maintainer Notes:
 As of version 1.02, does not require the convoluted build process used
diff --git a/metadata/org.coolreader.txt b/metadata/org.coolreader.txt
index 921d18ce83..ee6b78d567 100644
--- a/metadata/org.coolreader.txt
+++ b/metadata/org.coolreader.txt
@@ -342,7 +342,6 @@ Build:3.1.2-68,888
     rm=android/build.properties
     target=android-22
     buildjni=yes
-    ndk=r10e
 
 Build:3.1.2-72,892
     commit=cr3.1.2-71
@@ -351,7 +350,6 @@ Build:3.1.2-72,892
     target=android-22
     prebuild=sed -i -e 's/^APP_ABI\s*:=.*/APP_ABI := all/' jni/Application.mk
     buildjni=yes
-    ndk=r10e
 
 Auto Update Mode:None
 Update Check Mode:Tags
diff --git a/metadata/org.documentfoundation.libreoffice.txt b/metadata/org.documentfoundation.libreoffice.txt
index 19ff73c513..d8bf244e28 100644
--- a/metadata/org.documentfoundation.libreoffice.txt
+++ b/metadata/org.documentfoundation.libreoffice.txt
@@ -24,7 +24,6 @@ Repo:git://anongit.freedesktop.org/libreoffice/core
 Build:5.0.0.0.alpha1+/ab465b9,1
     commit=ab465b9
     srclibs=LOTarballs@c7c4bd4
-    ndk=r10e
     output=android/experimental/LOAndroid3/bin/LibreOfficeViewer-release-unsigned.apk
     prebuild=sed -i -e 's/\/$(OOO_VENDOR)//g' android/Bootstrap/Makefile.shared && \
         sed -i -e 's/test_fontconfig=yes/test_fontconfig=no/g' configure.ac && \
@@ -37,7 +36,6 @@ Build:5.0.0.0.alpha1+/ab465b9,1
 Build:5.0.0.0.alpha1+/ab465b9,2
     commit=ab465b9
     srclibs=LOTarballs@c7c4bd4
-    ndk=r10e
     output=android/experimental/LOAndroid3/bin/LibreOfficeViewer-release-unsigned.apk
     prebuild=sed -i -e 's/\/$(OOO_VENDOR)//g' android/Bootstrap/Makefile.shared && \
         sed -i -e 's/test_fontconfig=yes/test_fontconfig=no/g' configure.ac && \
diff --git a/metadata/org.freeminer.freeminer.txt b/metadata/org.freeminer.freeminer.txt
index 1027b57d2e..068109cd2f 100644
--- a/metadata/org.freeminer.freeminer.txt
+++ b/metadata/org.freeminer.freeminer.txt
@@ -30,7 +30,6 @@ Build:0.4.12.6.13,13
     output=bin/freeminer-release-unsigned.apk
     subdir=build/android
     buildjni=no
-    ndk=r10e
     build=printf "%s\n%s\n%s" \
             "ANDROID_NDK = $$NDK$$" \
             "NDK_MODULE_PATH = $$NDK$$/toolchains" \
@@ -43,7 +42,6 @@ Build:0.4.12.6.15,15
     output=bin/freeminer-release-unsigned.apk
     subdir=build/android
     buildjni=no
-    ndk=r10e
     build=printf "%s\n%s\n%s" \
             "ANDROID_NDK = $$NDK$$" \
             "NDK_MODULE_PATH = $$NDK$$/toolchains" \
@@ -57,7 +55,6 @@ Build:0.4.12.6.25,25
     output=bin/freeminer-release-unsigned.apk
     subdir=build/android
     buildjni=no
-    ndk=r10e
     build=printf "%s\n%s\n%s" \
             "ANDROID_NDK = $$NDK$$" \
             "NDK_MODULE_PATH = $$NDK$$/toolchains" \
diff --git a/metadata/org.helllabs.android.xmp.txt b/metadata/org.helllabs.android.xmp.txt
index faf52c2c76..ebceeb8d00 100644
--- a/metadata/org.helllabs.android.xmp.txt
+++ b/metadata/org.helllabs.android.xmp.txt
@@ -147,7 +147,6 @@ Build:4.3.1,73
         popd && \
         mv $$Groundy$$/build/libs/groundy-1.5.jar libs/
     buildjni=yes
-    ndk=r10e
 
 Build:4.4.1,75
     disable=app crash on startup
@@ -177,7 +176,6 @@ Build:4.4.1,75
         mv $$Groundy$$/build/libs/groundy-1.5.jar libs/ && \
         $$NDK$$/ndk-build TARGET_PLATFORM=android-21
     buildjni=no
-    ndk=r10e
 
 Maintainer Notes:
 The most recent libxmp version should be fine for all builds.
diff --git a/metadata/org.linphone.txt b/metadata/org.linphone.txt
index b60d324726..8ea747068e 100644
--- a/metadata/org.linphone.txt
+++ b/metadata/org.linphone.txt
@@ -98,7 +98,6 @@ Build:2.3.2-fdroid,2302
     target=android-19
     build=make generate-libs BUILD_GPLV3_ZRTP=1
     buildjni=no
-    ndk=r10e
 
 Build:2.4.0-fdroid,2400
     commit=2.4.0
@@ -128,7 +127,6 @@ Build:2.4.0-fdroid,2400
     scanignore=submodules/mswebrtc/webrtc/modules/video_capture/main/source/android/java/org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid.java
     build=make generate-libs BUILD_GPLV3_ZRTP=1
     buildjni=no
-    ndk=r10e
 
 Build:2.4.1-fdroid,2411
     commit=2.4.1
@@ -158,7 +156,6 @@ Build:2.4.1-fdroid,2411
     scanignore=submodules/mswebrtc/webrtc/modules/video_capture/main/source/android/java/org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid.java
     build=make generate-libs BUILD_GPLV3_ZRTP=1
     buildjni=no
-    ndk=r10e
 
 Maintainer Notes:
 * TODO: Clean up (move rm's to rm= field etc.)
diff --git a/metadata/org.mosspaper.txt b/metadata/org.mosspaper.txt
index 586503e58d..cf1173f297 100644
--- a/metadata/org.mosspaper.txt
+++ b/metadata/org.mosspaper.txt
@@ -28,7 +28,6 @@ Build:0.5,5
     buildjni=yes
 
 Build:0.6,6
-    ndk=r10e
     commit=v0.6
     submodules=yes
     subdir=moss
diff --git a/metadata/org.mozilla.fennec_fdroid.txt b/metadata/org.mozilla.fennec_fdroid.txt
index d3b13ac788..f9c50975e9 100644
--- a/metadata/org.mozilla.fennec_fdroid.txt
+++ b/metadata/org.mozilla.fennec_fdroid.txt
@@ -139,7 +139,6 @@ Build:36.0,360000
     commit=FENNEC_36_0_RELEASE
     srclibs=MozLocales@11c8e4b7b332e466f72df2fb7a340ec8143b1135
     output=fdroid/fennec-unsigned.apk
-    ndk=r10e
     init=\
         rm -R docshell/test/ && \
         rm -R dom/tests/ && \
@@ -198,7 +197,6 @@ Build:36.0,360010
     commit=FENNEC_36_0_RELEASE
     srclibs=MozLocales@11c8e4b7b332e466f72df2fb7a340ec8143b1135
     output=fdroid/fennec-unsigned.apk
-    ndk=r10e
     init=\
         rm -R docshell/test/ && \
         rm -R dom/tests/ && \
@@ -257,7 +255,6 @@ Build:36.0.1,360100
     commit=FENNEC_36_0_1_RELEASE
     srclibs=MozLocales@11c8e4b7b332e466f72df2fb7a340ec8143b1135
     output=fdroid/fennec-unsigned.apk
-    ndk=r10e
     init=\
         rm -R docshell/test/ && \
         rm -R dom/tests/ && \
@@ -318,7 +315,6 @@ Build:36.0.1,360110
     commit=FENNEC_36_0_1_RELEASE
     srclibs=MozLocales@11c8e4b7b332e466f72df2fb7a340ec8143b1135
     output=fdroid/fennec-unsigned.apk
-    ndk=r10e
     init=\
         rm -R docshell/test/ && \
         rm -R dom/tests/ && \
@@ -379,7 +375,6 @@ Build:36.0.4,360400
     commit=FENNEC_36_0_4_RELEASE
     srclibs=MozLocales@11c8e4b7b332e466f72df2fb7a340ec8143b1135
     output=fdroid/fennec-unsigned.apk
-    ndk=r10e
     init=rm -R docshell/test/ dom/tests/ modules/libjar/test/ security/manager/ssl/tests/*test/ security/nss/cmd/bltest/tests/ security/nss/tests/ toolkit/crashreporter/moz.build toolkit/crashreporter/client/ toolkit/crashreporter/google-breakpad/src/tools/ toolkit/crashreporter/google-breakpad/src/client/ toolkit/crashreporter/google-breakpad/src/processor/testdata/ toolkit/crashreporter/google-breakpad/src/third_party/linux/ toolkit/mozapps/extensions/test/ xpcom/tests/
     patch=36.0.4-android-22-a.patch,36.0.4-android-22-b.patch
     scanignore=mobile/android/base/JavaAddonManager.java
@@ -427,7 +422,6 @@ Build:36.0.4,360410
     commit=FENNEC_36_0_4_RELEASE
     srclibs=MozLocales@11c8e4b7b332e466f72df2fb7a340ec8143b1135
     output=fdroid/fennec-unsigned.apk
-    ndk=r10e
     init=rm -R docshell/test/ dom/tests/ modules/libjar/test/ security/manager/ssl/tests/*test/ security/nss/cmd/bltest/tests/ security/nss/tests/ toolkit/crashreporter/moz.build toolkit/crashreporter/client/ toolkit/crashreporter/google-breakpad/src/tools/ toolkit/crashreporter/google-breakpad/src/client/ toolkit/crashreporter/google-breakpad/src/processor/testdata/ toolkit/crashreporter/google-breakpad/src/third_party/linux/ toolkit/mozapps/extensions/test/ xpcom/tests/
     patch=36.0.4-android-22-a.patch,36.0.4-android-22-b.patch
     scanignore=mobile/android/base/JavaAddonManager.java
@@ -475,7 +469,6 @@ Build:37.0,370000
     commit=FENNEC_37_0_RELEASE
     srclibs=MozLocales@a7219763
     output=fdroid/fennec-unsigned.apk
-    ndk=r10e
     init=rm -R docshell/test/ dom/tests/ modules/libjar/test/ security/manager/ssl/tests/*test/ security/nss/cmd/bltest/tests/ security/nss/tests/ toolkit/crashreporter/moz.build toolkit/crashreporter/client/ toolkit/crashreporter/google-breakpad/src/tools/ toolkit/crashreporter/google-breakpad/src/client/ toolkit/crashreporter/google-breakpad/src/processor/testdata/ toolkit/crashreporter/google-breakpad/src/third_party/linux/ toolkit/mozapps/extensions/test/ xpcom/tests/
     patch=36.0.4-android-22-a.patch,36.0.4-android-22-b.patch
     scanignore=mobile/android/base/JavaAddonManager.java
@@ -521,7 +514,6 @@ Build:37.0,370010
     commit=FENNEC_37_0_RELEASE
     srclibs=MozLocales@a7219763
     output=fdroid/fennec-unsigned.apk
-    ndk=r10e
     init=rm -R docshell/test/ dom/tests/ modules/libjar/test/ security/manager/ssl/tests/*test/ security/nss/cmd/bltest/tests/ security/nss/tests/ toolkit/crashreporter/moz.build toolkit/crashreporter/client/ toolkit/crashreporter/google-breakpad/src/tools/ toolkit/crashreporter/google-breakpad/src/client/ toolkit/crashreporter/google-breakpad/src/processor/testdata/ toolkit/crashreporter/google-breakpad/src/third_party/linux/ toolkit/mozapps/extensions/test/ xpcom/tests/
     patch=36.0.4-android-22-a.patch,36.0.4-android-22-b.patch
     scanignore=mobile/android/base/JavaAddonManager.java
@@ -567,7 +559,6 @@ Build:37.0.1,370100
     commit=FENNEC_37_0_1_RELEASE
     srclibs=MozLocales@a7219763
     output=fdroid/fennec-unsigned.apk
-    ndk=r10e
     init=rm -R docshell/test/ dom/tests/ modules/libjar/test/ security/manager/ssl/tests/*test/ security/nss/cmd/bltest/tests/ security/nss/tests/ toolkit/crashreporter/moz.build toolkit/crashreporter/client/ toolkit/crashreporter/google-breakpad/src/tools/ toolkit/crashreporter/google-breakpad/src/client/ toolkit/crashreporter/google-breakpad/src/processor/testdata/ toolkit/crashreporter/google-breakpad/src/third_party/linux/ toolkit/mozapps/extensions/test/ xpcom/tests/
     patch=36.0.4-android-22-a.patch,36.0.4-android-22-b.patch
     scanignore=mobile/android/base/JavaAddonManager.java
@@ -613,7 +604,6 @@ Build:37.0.1,370110
     commit=FENNEC_37_0_1_RELEASE
     srclibs=MozLocales@a7219763
     output=fdroid/fennec-unsigned.apk
-    ndk=r10e
     init=rm -R docshell/test/ dom/tests/ modules/libjar/test/ security/manager/ssl/tests/*test/ security/nss/cmd/bltest/tests/ security/nss/tests/ toolkit/crashreporter/moz.build toolkit/crashreporter/client/ toolkit/crashreporter/google-breakpad/src/tools/ toolkit/crashreporter/google-breakpad/src/client/ toolkit/crashreporter/google-breakpad/src/processor/testdata/ toolkit/crashreporter/google-breakpad/src/third_party/linux/ toolkit/mozapps/extensions/test/ xpcom/tests/
     patch=36.0.4-android-22-a.patch,36.0.4-android-22-b.patch
     scanignore=mobile/android/base/JavaAddonManager.java
@@ -659,7 +649,6 @@ Build:37.0.2,370200
     commit=FENNEC_37_0_2_RELEASE
     srclibs=MozLocales@a7219763
     output=fdroid/fennec-unsigned.apk
-    ndk=r10e
     init=rm -R docshell/test/ dom/tests/ modules/libjar/test/ security/manager/ssl/tests/*test/ security/nss/cmd/bltest/tests/ security/nss/tests/ toolkit/crashreporter/moz.build toolkit/crashreporter/client/ toolkit/crashreporter/google-breakpad/src/tools/ toolkit/crashreporter/google-breakpad/src/client/ toolkit/crashreporter/google-breakpad/src/processor/testdata/ toolkit/crashreporter/google-breakpad/src/third_party/linux/ toolkit/mozapps/extensions/test/ xpcom/tests/
     patch=36.0.4-android-22-a.patch,36.0.4-android-22-b.patch
     scanignore=mobile/android/base/JavaAddonManager.java
@@ -705,7 +694,6 @@ Build:37.0.2,370210
     commit=FENNEC_37_0_2_RELEASE
     srclibs=MozLocales@a7219763
     output=fdroid/fennec-unsigned.apk
-    ndk=r10e
     init=rm -R docshell/test/ dom/tests/ modules/libjar/test/ security/manager/ssl/tests/*test/ security/nss/cmd/bltest/tests/ security/nss/tests/ toolkit/crashreporter/moz.build toolkit/crashreporter/client/ toolkit/crashreporter/google-breakpad/src/tools/ toolkit/crashreporter/google-breakpad/src/client/ toolkit/crashreporter/google-breakpad/src/processor/testdata/ toolkit/crashreporter/google-breakpad/src/third_party/linux/ toolkit/mozapps/extensions/test/ xpcom/tests/
     patch=36.0.4-android-22-a.patch,36.0.4-android-22-b.patch
     scanignore=mobile/android/base/JavaAddonManager.java
@@ -751,7 +739,6 @@ Build:38.0,380000
     commit=FENNEC_38_0_RELEASE
     srclibs=MozLocales@a7219763
     output=fdroid/fennec-unsigned.apk
-    ndk=r10e
     init=rm -R docshell/test/ dom/tests/ modules/libjar/test/ security/manager/ssl/tests/*test/ security/nss/cmd/bltest/tests/ security/nss/tests/ toolkit/crashreporter/moz.build toolkit/crashreporter/client/ toolkit/crashreporter/google-breakpad/src/tools/ toolkit/crashreporter/google-breakpad/src/client/ toolkit/crashreporter/google-breakpad/src/processor/testdata/ toolkit/crashreporter/google-breakpad/src/third_party/linux/ toolkit/mozapps/extensions/test/ xpcom/tests/ && \
         sed -i -e '/nsExceptionHandler/d' ipc/glue/GeckoChildProcessHost.cpp && \
         sed -i -e '/nsExceptionHandler/d' toolkit/xre/nsAndroidStartup.cpp && \
@@ -822,7 +809,6 @@ Build:38.0,380010
     commit=FENNEC_38_0_RELEASE
     srclibs=MozLocales@a7219763
     output=fdroid/fennec-unsigned.apk
-    ndk=r10e
     init=rm -R docshell/test/ dom/tests/ modules/libjar/test/ security/manager/ssl/tests/*test/ security/nss/cmd/bltest/tests/ security/nss/tests/ toolkit/crashreporter/moz.build toolkit/crashreporter/client/ toolkit/crashreporter/google-breakpad/src/tools/ toolkit/crashreporter/google-breakpad/src/client/ toolkit/crashreporter/google-breakpad/src/processor/testdata/ toolkit/crashreporter/google-breakpad/src/third_party/linux/ toolkit/mozapps/extensions/test/ xpcom/tests/ && \
         sed -i -e '/nsExceptionHandler/d' ipc/glue/GeckoChildProcessHost.cpp && \
         sed -i -e '/nsExceptionHandler/d' toolkit/xre/nsAndroidStartup.cpp && \
@@ -892,7 +878,6 @@ Build:38.0.1,380100
     commit=FENNEC_38_0_1_RELEASE
     srclibs=MozLocales@a7219763
     output=fdroid/fennec-unsigned.apk
-    ndk=r10e
     init=rm -R docshell/test/ dom/tests/ modules/libjar/test/ security/manager/ssl/tests/*test/ security/nss/cmd/bltest/tests/ security/nss/tests/ toolkit/crashreporter/moz.build toolkit/crashreporter/client/ toolkit/crashreporter/google-breakpad/src/tools/ toolkit/crashreporter/google-breakpad/src/client/ toolkit/crashreporter/google-breakpad/src/processor/testdata/ toolkit/crashreporter/google-breakpad/src/third_party/linux/ toolkit/mozapps/extensions/test/ xpcom/tests/ && \
         sed -i -e '/nsExceptionHandler/d' ipc/glue/GeckoChildProcessHost.cpp && \
         sed -i -e '/nsExceptionHandler/d' toolkit/xre/nsAndroidStartup.cpp && \
@@ -962,7 +947,6 @@ Build:38.0.1,380110
     commit=FENNEC_38_0_1_RELEASE
     srclibs=MozLocales@a7219763
     output=fdroid/fennec-unsigned.apk
-    ndk=r10e
     init=rm -R docshell/test/ dom/tests/ modules/libjar/test/ security/manager/ssl/tests/*test/ security/nss/cmd/bltest/tests/ security/nss/tests/ toolkit/crashreporter/moz.build toolkit/crashreporter/client/ toolkit/crashreporter/google-breakpad/src/tools/ toolkit/crashreporter/google-breakpad/src/client/ toolkit/crashreporter/google-breakpad/src/processor/testdata/ toolkit/crashreporter/google-breakpad/src/third_party/linux/ toolkit/mozapps/extensions/test/ xpcom/tests/ && \
         sed -i -e '/nsExceptionHandler/d' ipc/glue/GeckoChildProcessHost.cpp && \
         sed -i -e '/nsExceptionHandler/d' toolkit/xre/nsAndroidStartup.cpp && \
@@ -1032,7 +1016,6 @@ Build:38.0.5,380500
     commit=FENNEC_38_0_5_RELEASE
     srclibs=MozLocales@a7219763
     output=fdroid/fennec-unsigned.apk
-    ndk=r10e
     init=rm -R docshell/test/ dom/tests/ modules/libjar/test/ security/manager/ssl/tests/*test/ security/nss/cmd/bltest/tests/ security/nss/tests/ toolkit/crashreporter/moz.build toolkit/crashreporter/client/ toolkit/crashreporter/google-breakpad/src/tools/ toolkit/crashreporter/google-breakpad/src/client/ toolkit/crashreporter/google-breakpad/src/processor/testdata/ toolkit/crashreporter/google-breakpad/src/third_party/linux/ toolkit/mozapps/extensions/test/ xpcom/tests/ && \
         sed -i -e '/nsExceptionHandler/d' ipc/glue/GeckoChildProcessHost.cpp && \
         sed -i -e '/nsExceptionHandler/d' toolkit/xre/nsAndroidStartup.cpp && \
@@ -1102,7 +1085,6 @@ Build:38.0.5,380510
     commit=FENNEC_38_0_5_RELEASE
     srclibs=MozLocales@a7219763
     output=fdroid/fennec-unsigned.apk
-    ndk=r10e
     init=rm -R docshell/test/ dom/tests/ modules/libjar/test/ security/manager/ssl/tests/*test/ security/nss/cmd/bltest/tests/ security/nss/tests/ toolkit/crashreporter/moz.build toolkit/crashreporter/client/ toolkit/crashreporter/google-breakpad/src/tools/ toolkit/crashreporter/google-breakpad/src/client/ toolkit/crashreporter/google-breakpad/src/processor/testdata/ toolkit/crashreporter/google-breakpad/src/third_party/linux/ toolkit/mozapps/extensions/test/ xpcom/tests/ && \
         sed -i -e '/nsExceptionHandler/d' ipc/glue/GeckoChildProcessHost.cpp && \
         sed -i -e '/nsExceptionHandler/d' toolkit/xre/nsAndroidStartup.cpp && \
@@ -1172,7 +1154,6 @@ Build:39.0,390000
     commit=FENNEC_39_0_RELEASE
     srclibs=MozLocales@06bd272337dc1ffe7255982e4f7643b6bfcfd774
     output=fdroid/fennec-unsigned.apk
-    ndk=r10e
     init=\
         find toolkit/crashreporter/ -mindepth 1 -maxdepth 1 ! -name "crashreporter.mozbuild" ! -name "google-breakpad" -exec rm -R '{}' \; && \
         find toolkit/crashreporter/google-breakpad/ -mindepth 1 -maxdepth 1 ! -name "src" -exec rm -R '{}' \; && \
@@ -1295,7 +1276,6 @@ Build:39.0,390010
     commit=FENNEC_39_0_RELEASE
     srclibs=MozLocales@06bd272337dc1ffe7255982e4f7643b6bfcfd774
     output=fdroid/fennec-unsigned.apk
-    ndk=r10e
     init=\
         find toolkit/crashreporter/ -mindepth 1 -maxdepth 1 ! -name "crashreporter.mozbuild" ! -name "google-breakpad" -exec rm -R '{}' \; && \
         find toolkit/crashreporter/google-breakpad/ -mindepth 1 -maxdepth 1 ! -name "src" -exec rm -R '{}' \; && \
@@ -1418,7 +1398,6 @@ Build:39.0.1,390100
     commit=FENNEC_39_0_1_RELEASE
     srclibs=MozLocales@06bd272337dc1ffe7255982e4f7643b6bfcfd774
     output=fdroid/fennec-unsigned.apk
-    ndk=r10e
     init=\
         find toolkit/crashreporter/ -mindepth 1 -maxdepth 1 ! -name "crashreporter.mozbuild" ! -name "google-breakpad" -exec rm -R '{}' \; && \
         find toolkit/crashreporter/google-breakpad/ -mindepth 1 -maxdepth 1 ! -name "src" -exec rm -R '{}' \; && \
@@ -1541,7 +1520,6 @@ Build:39.0.1,390110
     commit=FENNEC_39_0_1_RELEASE
     srclibs=MozLocales@06bd272337dc1ffe7255982e4f7643b6bfcfd774
     output=fdroid/fennec-unsigned.apk
-    ndk=r10e
     init=\
         find toolkit/crashreporter/ -mindepth 1 -maxdepth 1 ! -name "crashreporter.mozbuild" ! -name "google-breakpad" -exec rm -R '{}' \; && \
         find toolkit/crashreporter/google-breakpad/ -mindepth 1 -maxdepth 1 ! -name "src" -exec rm -R '{}' \; && \
@@ -1664,7 +1642,6 @@ Build:39.0.2,390200
     commit=FENNEC_39_0_2_RELEASE
     srclibs=MozLocales@06bd272337dc1ffe7255982e4f7643b6bfcfd774
     output=fdroid/fennec-unsigned.apk
-    ndk=r10e
     init=\
         find toolkit/crashreporter/ -mindepth 1 -maxdepth 1 ! -name "crashreporter.mozbuild" ! -name "google-breakpad" -exec rm -R '{}' \; && \
         find toolkit/crashreporter/google-breakpad/ -mindepth 1 -maxdepth 1 ! -name "src" -exec rm -R '{}' \; && \
@@ -1788,7 +1765,6 @@ Build:39.0.2,390210
     commit=FENNEC_39_0_2_RELEASE
     srclibs=MozLocales@06bd272337dc1ffe7255982e4f7643b6bfcfd774
     output=fdroid/fennec-unsigned.apk
-    ndk=r10e
     init=\
         find toolkit/crashreporter/ -mindepth 1 -maxdepth 1 ! -name "crashreporter.mozbuild" ! -name "google-breakpad" -exec rm -R '{}' \; && \
         find toolkit/crashreporter/google-breakpad/ -mindepth 1 -maxdepth 1 ! -name "src" -exec rm -R '{}' \; && \
diff --git a/metadata/org.petero.droidfish.txt b/metadata/org.petero.droidfish.txt
index e87428bbfa..e7f5064584 100644
--- a/metadata/org.petero.droidfish.txt
+++ b/metadata/org.petero.droidfish.txt
@@ -95,7 +95,6 @@ Build:1.56,64
     build=$$NDK$$/ndk-build && \
         ant -f build_copy_exe.xml
     buildjni=no
-    ndk=r10e
 
 Build:1.57,65
     commit=1202
@@ -104,7 +103,6 @@ Build:1.57,65
     build=$$NDK$$/ndk-build && \
         ant -f build_copy_exe.xml
     buildjni=no
-    ndk=r10e
 
 Auto Update Mode:None
 Update Check Mode:RepoManifest
diff --git a/metadata/org.sufficientlysecure.viewer.txt b/metadata/org.sufficientlysecure.viewer.txt
index d940f507c3..ed203e40a7 100644
--- a/metadata/org.sufficientlysecure.viewer.txt
+++ b/metadata/org.sufficientlysecure.viewer.txt
@@ -121,7 +121,6 @@ Build:2.7.3,2731
         sed -i -e '/ext\.versionCode/d' build.gradle && \
         echo "APP_ABI := armeabi" > jni/Application.mk && \
         pushd ../ && ./init.sh && popd
-    ndk=r10e
     forcevercode=yes
     scandelete=document-viewer/jni/mupdf/mupdf/build/debug/
     buildjni=yes
@@ -131,7 +130,6 @@ Build:2.7.3,2732
     subdir=document-viewer
     submodules=yes
     gradle=yes
-    ndk=r10e
     forcevercode=yes
     prebuild=sed -i -e '/splits/,+7d' build.gradle && \
         sed -i -e '/applicationVariants\.all/,+5d' build.gradle && \
@@ -146,7 +144,6 @@ Build:2.7.3,2733
     subdir=document-viewer
     submodules=yes
     gradle=yes
-    ndk=r10e
     forcevercode=yes
     prebuild=sed -i -e '/splits/,+7d' build.gradle && \
         sed -i -e '/applicationVariants\.all/,+5d' build.gradle && \
@@ -161,7 +158,6 @@ Build:2.7.3,2734
     subdir=document-viewer
     submodules=yes
     gradle=yes
-    ndk=r10e
     forcevercode=yes
     prebuild=sed -i -e '/splits/,+7d' build.gradle && \
         sed -i -e '/applicationVariants\.all/,+5d' build.gradle && \
@@ -176,7 +172,6 @@ Build:2.7.3,2735
     subdir=document-viewer
     submodules=yes
     gradle=yes
-    ndk=r10e
     forcevercode=yes
     prebuild=sed -i -e '/splits/,+7d' build.gradle && \
         sed -i -e '/applicationVariants\.all/,+5d' build.gradle && \
@@ -191,7 +186,6 @@ Build:2.7.3,2736
     subdir=document-viewer
     submodules=yes
     gradle=yes
-    ndk=r10e
     forcevercode=yes
     prebuild=sed -i -e '/splits/,+7d' build.gradle && \
         sed -i -e '/applicationVariants\.all/,+5d' build.gradle && \
@@ -206,7 +200,6 @@ Build:2.7.3,2737
     subdir=document-viewer
     submodules=yes
     gradle=yes
-    ndk=r10e
     forcevercode=yes
     prebuild=sed -i -e '/splits/,+7d' build.gradle && \
         sed -i -e '/applicationVariants\.all/,+5d' build.gradle && \
diff --git a/metadata/org.telegram.messenger.txt b/metadata/org.telegram.messenger.txt
index 705df10fa9..dcd393d8d3 100644
--- a/metadata/org.telegram.messenger.txt
+++ b/metadata/org.telegram.messenger.txt
@@ -155,7 +155,6 @@ Build:2.4.0,423
     build=$$NDK$$/ndk-build && \
         gradle nativeLibsToJar
     buildjni=no
-    ndk=r10e
 
 Build:2.5.2,458
     commit=v2.5.2
@@ -164,7 +163,6 @@ Build:2.5.2,458
     build=$$NDK$$/ndk-build && \
         gradle nativeLibsToJar
     buildjni=no
-    ndk=r10e
 
 Build:2.6.0,469
     commit=v2.6.0
@@ -173,7 +171,6 @@ Build:2.6.0,469
     build=$$NDK$$/ndk-build && \
         gradle nativeLibsToJar
     buildjni=no
-    ndk=r10e
 
 Build:2.8.1,521
     commit=v2.8.1
@@ -182,7 +179,6 @@ Build:2.8.1,521
     build=$$NDK$$/ndk-build && \
         gradle nativeLibsToJar
     buildjni=no
-    ndk=r10e
 
 Build:2.9.1,542
     commit=v2.9.1
@@ -191,7 +187,6 @@ Build:2.9.1,542
     build=$$NDK$$/ndk-build && \
         gradle nativeLibsToJar
     buildjni=no
-    ndk=r10e
 
 Build:3.0.1,572
     commit=v3.0.1
@@ -200,7 +195,6 @@ Build:3.0.1,572
     build=$$NDK$$/ndk-build && \
         gradle nativeLibsToJar
     buildjni=no
-    ndk=r10e
 
 Auto Update Mode:Version v%v
 Update Check Mode:Tags
diff --git a/metadata/org.torproject.android.txt b/metadata/org.torproject.android.txt
index 87ffe45a74..1b79e71f00 100644
--- a/metadata/org.torproject.android.txt
+++ b/metadata/org.torproject.android.txt
@@ -239,7 +239,6 @@ Build:15.0.1-RC-1-noPIE,15012101
         sed -i -e 's#uses-sdk.*#uses-sdk android:minSdkVersion="9" android:maxSdkVersion="15" android:targetSdkVersion="15"/>#' AndroidManifest.xml
     build=NDK_BASE=$$NDK$$ make -C external APP_ABI=armeabi PIEFLAGS=""
     buildjni=yes
-    ndk=r10e
 
 Build:15.0.1-RC-1-noPIE,15012102
     disable=archive policy
@@ -254,7 +253,6 @@ Build:15.0.1-RC-1-noPIE,15012102
         sed -i -e 's#uses-sdk.*#uses-sdk android:minSdkVersion="9" android:maxSdkVersion="15" android:targetSdkVersion="15"/>#' AndroidManifest.xml
     build=NDK_BASE=$$NDK$$ make -C external APP_ABI=x86 PIEFLAGS=""
     buildjni=yes
-    ndk=r10e
 
 Build:15.0.1-RC-1-noPIE,15012103
     disable=archive policy
@@ -269,7 +267,6 @@ Build:15.0.1-RC-1-noPIE,15012103
         sed -i -e 's#uses-sdk.*#uses-sdk android:minSdkVersion="9" android:maxSdkVersion="15" android:targetSdkVersion="15"/>#' AndroidManifest.xml
     build=NDK_BASE=$$NDK$$ make -C external APP_ABI=mips PIEFLAGS=""
     buildjni=yes
-    ndk=r10e
 
 Build:15.0.1-RC-1-PIE,15012111
     disable=archive policy
@@ -281,7 +278,6 @@ Build:15.0.1-RC-1-PIE,15012111
         sed -i -e '/APP_ABI/ s/:=.*/:= armeabi armeabi-v7a/' jni/Application.mk
     build=NDK_BASE=$$NDK$$ make -C external APP_ABI=armeabi PIEFLAGS="-fPIE -pie"
     buildjni=yes
-    ndk=r10e
 
 Build:15.0.1-RC-1-PIE,15012112
     disable=archive policy
@@ -294,7 +290,6 @@ Build:15.0.1-RC-1-PIE,15012112
         sed -i -e '/APP_ABI/ s/:=.*/:= x86/' jni/Application.mk
     build=NDK_BASE=$$NDK$$ make -C external APP_ABI=x86 PIEFLAGS="-fPIE -pie"
     buildjni=yes
-    ndk=r10e
 
 Build:15.0.1-RC-1-PIE,15012113
     disable=archive policy
@@ -307,7 +302,6 @@ Build:15.0.1-RC-1-PIE,15012113
         sed -i -e '/APP_ABI/ s/:=.*/:= mips/' jni/Application.mk
     build=NDK_BASE=$$NDK$$ make -C external APP_ABI=mips PIEFLAGS="-fPIE -pie"
     buildjni=yes
-    ndk=r10e
 
 Build:15.0.1-RC-1-PIE,15012114
     disable=archive policy
@@ -320,7 +314,6 @@ Build:15.0.1-RC-1-PIE,15012114
         sed -i -e '/APP_ABI/ s/:=.*/:= arm64-v8a/' jni/Application.mk
     build=NDK_BASE=$$NDK$$ make -C external APP_ABI=arm64-v8a PIEFLAGS="-fPIE -pie" NDK_PLATFORM_LEVEL=21 NDK_TOOLCHAIN_VERSION=4.9
     buildjni=yes
-    ndk=r10e
 
 Build:15.0.1-RC-1-PIE,15012115
     disable=libcrypto.a(eng_rsax.o):eng_rsax.c:function e_rsax_bn_mod_exp: error: undefined reference to 'mod_exp_512'
@@ -333,7 +326,6 @@ Build:15.0.1-RC-1-PIE,15012115
         sed -i -e '/APP_ABI/ s/:=.*/:= x86_64/' jni/Application.mk
     build=NDK_BASE=$$NDK$$ make -C external APP_ABI=x86_64 PIEFLAGS="-fPIE -pie" NDK_PLATFORM_LEVEL=21 NDK_TOOLCHAIN_VERSION=4.9
     buildjni=yes
-    ndk=r10e
 
 Build:15.0.1-RC-1-PIE,15012116
     disable=archive policy
@@ -346,7 +338,6 @@ Build:15.0.1-RC-1-PIE,15012116
         sed -i -e '/APP_ABI/ s/:=.*/:= mips64/' jni/Application.mk
     build=NDK_BASE=$$NDK$$ make -C external APP_ABI=mips64 PIEFLAGS="-fPIE -pie" NDK_PLATFORM_LEVEL=21 NDK_TOOLCHAIN_VERSION=4.9
     buildjni=yes
-    ndk=r10e
 
 Build:15.0.1-RC-2-noPIE,15012201
     commit=15.0.1-RC-2
@@ -360,7 +351,6 @@ Build:15.0.1-RC-2-noPIE,15012201
         sed -i -e 's#uses-sdk.*#uses-sdk android:minSdkVersion="9" android:maxSdkVersion="15" android:targetSdkVersion="15"/>#' AndroidManifest.xml
     build=NDK_BASE=$$NDK$$ make -C external APP_ABI=armeabi PIEFLAGS=""
     buildjni=yes
-    ndk=r10e
 
 Build:15.0.1-RC-2-noPIE,15012202
     commit=15.0.1-RC-2
@@ -374,7 +364,6 @@ Build:15.0.1-RC-2-noPIE,15012202
         sed -i -e 's#uses-sdk.*#uses-sdk android:minSdkVersion="9" android:maxSdkVersion="15" android:targetSdkVersion="15"/>#' AndroidManifest.xml
     build=NDK_BASE=$$NDK$$ make -C external APP_ABI=x86 PIEFLAGS=""
     buildjni=yes
-    ndk=r10e
 
 Build:15.0.1-RC-2-noPIE,15012203
     commit=15.0.1-RC-2
@@ -388,7 +377,6 @@ Build:15.0.1-RC-2-noPIE,15012203
         sed -i -e 's#uses-sdk.*#uses-sdk android:minSdkVersion="9" android:maxSdkVersion="15" android:targetSdkVersion="15"/>#' AndroidManifest.xml
     build=NDK_BASE=$$NDK$$ make -C external APP_ABI=mips PIEFLAGS=""
     buildjni=yes
-    ndk=r10e
 
 Build:15.0.1-RC-2-PIE,15012211
     commit=15.0.1-RC-2
@@ -399,7 +387,6 @@ Build:15.0.1-RC-2-PIE,15012211
         sed -i -e '/APP_ABI/ s/:=.*/:= armeabi armeabi-v7a/' jni/Application.mk
     build=NDK_BASE=$$NDK$$ make -C external APP_ABI=armeabi PIEFLAGS="-fPIE -pie"
     buildjni=yes
-    ndk=r10e
 
 Build:15.0.1-RC-2-PIE,15012212
     commit=15.0.1-RC-2
@@ -411,7 +398,6 @@ Build:15.0.1-RC-2-PIE,15012212
         sed -i -e '/APP_ABI/ s/:=.*/:= x86/' jni/Application.mk
     build=NDK_BASE=$$NDK$$ make -C external APP_ABI=x86 PIEFLAGS="-fPIE -pie"
     buildjni=yes
-    ndk=r10e
 
 Build:15.0.1-RC-2-PIE,15012213
     commit=15.0.1-RC-2
@@ -423,7 +409,6 @@ Build:15.0.1-RC-2-PIE,15012213
         sed -i -e '/APP_ABI/ s/:=.*/:= mips/' jni/Application.mk
     build=NDK_BASE=$$NDK$$ make -C external APP_ABI=mips PIEFLAGS="-fPIE -pie"
     buildjni=yes
-    ndk=r10e
 
 Build:15.0.1-RC-2-PIE,15012214
     commit=15.0.1-RC-2
@@ -435,7 +420,6 @@ Build:15.0.1-RC-2-PIE,15012214
         sed -i -e '/APP_ABI/ s/:=.*/:= arm64-v8a/' jni/Application.mk
     build=NDK_BASE=$$NDK$$ make -C external APP_ABI=arm64-v8a PIEFLAGS="-fPIE -pie" NDK_PLATFORM_LEVEL=21 NDK_TOOLCHAIN_VERSION=4.9
     buildjni=yes
-    ndk=r10e
 
 Build:15.0.1-RC-2-PIE,15012215
     disable=libcrypto.a(eng_rsax.o):eng_rsax.c:function e_rsax_bn_mod_exp: error: undefined reference to 'mod_exp_512'
@@ -448,7 +432,6 @@ Build:15.0.1-RC-2-PIE,15012215
         sed -i -e '/APP_ABI/ s/:=.*/:= x86_64/' jni/Application.mk
     build=NDK_BASE=$$NDK$$ make -C external APP_ABI=x86_64 PIEFLAGS="-fPIE -pie" NDK_PLATFORM_LEVEL=21 NDK_TOOLCHAIN_VERSION=4.9
     buildjni=yes
-    ndk=r10e
 
 Build:15.0.1-RC-2-PIE,15012216
     commit=15.0.1-RC-2
@@ -460,7 +443,6 @@ Build:15.0.1-RC-2-PIE,15012216
         sed -i -e '/APP_ABI/ s/:=.*/:= mips64/' jni/Application.mk
     build=NDK_BASE=$$NDK$$ make -C external APP_ABI=mips64 PIEFLAGS="-fPIE -pie" NDK_PLATFORM_LEVEL=21 NDK_TOOLCHAIN_VERSION=4.9
     buildjni=yes
-    ndk=r10e
 
 Build:15.0.1-RC-3-noPIE,15012301
     commit=15.0.1-RC-3
@@ -474,7 +456,6 @@ Build:15.0.1-RC-3-noPIE,15012301
         sed -i -e 's#uses-sdk.*#uses-sdk android:minSdkVersion="9" android:maxSdkVersion="15" android:targetSdkVersion="15"/>#' AndroidManifest.xml
     build=NDK_BASE=$$NDK$$ make -C external APP_ABI=armeabi PIEFLAGS=""
     buildjni=yes
-    ndk=r10e
 
 Build:15.0.1-RC-3-noPIE,15012302
     commit=15.0.1-RC-3
@@ -488,7 +469,6 @@ Build:15.0.1-RC-3-noPIE,15012302
         sed -i -e 's#uses-sdk.*#uses-sdk android:minSdkVersion="9" android:maxSdkVersion="15" android:targetSdkVersion="15"/>#' AndroidManifest.xml
     build=NDK_BASE=$$NDK$$ make -C external APP_ABI=x86 PIEFLAGS=""
     buildjni=yes
-    ndk=r10e
 
 Build:15.0.1-RC-3-noPIE,15012303
     commit=15.0.1-RC-3
@@ -502,7 +482,6 @@ Build:15.0.1-RC-3-noPIE,15012303
         sed -i -e 's#uses-sdk.*#uses-sdk android:minSdkVersion="9" android:maxSdkVersion="15" android:targetSdkVersion="15"/>#' AndroidManifest.xml
     build=NDK_BASE=$$NDK$$ make -C external APP_ABI=mips PIEFLAGS=""
     buildjni=yes
-    ndk=r10e
 
 Build:15.0.1-RC-3-PIE,15012311
     commit=15.0.1-RC-3
@@ -514,7 +493,6 @@ Build:15.0.1-RC-3-PIE,15012311
         sed -i -e '/APP_ABI/ s/:=.*/:= armeabi armeabi-v7a/' jni/Application.mk
     build=NDK_BASE=$$NDK$$ make -C external APP_ABI=armeabi PIEFLAGS="-fPIE -pie"
     buildjni=yes
-    ndk=r10e
 
 Build:15.0.1-RC-3-PIE,15012312
     commit=15.0.1-RC-3
@@ -527,7 +505,6 @@ Build:15.0.1-RC-3-PIE,15012312
         sed -i -e '/APP_ABI/ s/:=.*/:= x86/' jni/Application.mk
     build=NDK_BASE=$$NDK$$ make -C external APP_ABI=x86 PIEFLAGS="-fPIE -pie"
     buildjni=yes
-    ndk=r10e
 
 Build:15.0.1-RC-3-PIE,15012313
     commit=15.0.1-RC-3
@@ -540,7 +517,6 @@ Build:15.0.1-RC-3-PIE,15012313
         sed -i -e '/APP_ABI/ s/:=.*/:= mips/' jni/Application.mk
     build=NDK_BASE=$$NDK$$ make -C external APP_ABI=mips PIEFLAGS="-fPIE -pie"
     buildjni=yes
-    ndk=r10e
 
 Build:15.0.1-RC-3-PIE,15012314
     commit=15.0.1-RC-3
@@ -553,7 +529,6 @@ Build:15.0.1-RC-3-PIE,15012314
         sed -i -e '/APP_ABI/ s/:=.*/:= arm64-v8a/' jni/Application.mk
     build=NDK_BASE=$$NDK$$ make -C external APP_ABI=arm64-v8a PIEFLAGS="-fPIE -pie" NDK_PLATFORM_LEVEL=21 NDK_TOOLCHAIN_VERSION=4.9
     buildjni=yes
-    ndk=r10e
 
 Build:15.0.1-RC-3-PIE,15012315
     commit=15.0.1-RC-3
@@ -566,7 +541,6 @@ Build:15.0.1-RC-3-PIE,15012315
         sed -i -e '/APP_ABI/ s/:=.*/:= x86_64/' jni/Application.mk
     build=NDK_BASE=$$NDK$$ make -C external APP_ABI=x86_64 PIEFLAGS="-fPIE -pie" NDK_PLATFORM_LEVEL=21 NDK_TOOLCHAIN_VERSION=4.9
     buildjni=yes
-    ndk=r10e
 
 Build:15.0.1-RC-3-PIE,15012316
     commit=15.0.1-RC-3
@@ -579,7 +553,6 @@ Build:15.0.1-RC-3-PIE,15012316
         sed -i -e '/APP_ABI/ s/:=.*/:= mips64/' jni/Application.mk
     build=NDK_BASE=$$NDK$$ make -C external APP_ABI=mips64 PIEFLAGS="-fPIE -pie" NDK_PLATFORM_LEVEL=21 NDK_TOOLCHAIN_VERSION=4.9
     buildjni=yes
-    ndk=r10e
 
 Maintainer Notes:
 * meekclient & ofbs4proxy are prebuilt with PIE for arm archs only. Hence remove them for other archs & for non-PIE builds.
diff --git a/metadata/org.videolan.vlc.txt b/metadata/org.videolan.vlc.txt
index 1d1e364d63..edff71d183 100644
--- a/metadata/org.videolan.vlc.txt
+++ b/metadata/org.videolan.vlc.txt
@@ -441,7 +441,6 @@ Build:1.1.3,1010303
     build=cd ../ && \
         ./compile.sh -a "armeabi" --release
     buildjni=no
-    ndk=r10e
 
 Build:1.1.3,1010304
     commit=1.1.3
@@ -453,7 +452,6 @@ Build:1.1.3,1010304
     build=cd ../ && \
         ./compile.sh -a "armeabi-v7a" --release
     buildjni=no
-    ndk=r10e
 
 Build:1.1.3,1010305
     commit=1.1.3
@@ -465,7 +463,6 @@ Build:1.1.3,1010305
     build=cd ../ && \
         ./compile.sh -a "x86" --release
     buildjni=no
-    ndk=r10e
 
 Build:1.1.5,1010503
     commit=1.1.5
@@ -477,7 +474,6 @@ Build:1.1.5,1010503
     build=cd ../ && \
         ./compile.sh -a "armeabi" --release
     buildjni=no
-    ndk=r10e
 
 Build:1.1.5,1010504
     commit=1.1.5
@@ -489,7 +485,6 @@ Build:1.1.5,1010504
     build=cd ../ && \
         ./compile.sh -a "armeabi-v7a" --release
     buildjni=no
-    ndk=r10e
 
 Build:1.1.5,1010505
     commit=1.1.5
@@ -501,7 +496,6 @@ Build:1.1.5,1010505
     build=cd ../ && \
         ./compile.sh -a "x86" --release
     buildjni=no
-    ndk=r10e
 
 Build:1.1.6,1010603
     commit=1.1.6
@@ -513,7 +507,6 @@ Build:1.1.6,1010603
     build=cd ../ && \
         ./compile.sh -a "armeabi" --release
     buildjni=no
-    ndk=r10e
 
 Build:1.1.6,1010604
     commit=1.1.6
@@ -525,7 +518,6 @@ Build:1.1.6,1010604
     build=cd ../ && \
         ./compile.sh -a "armeabi-v7a" --release
     buildjni=no
-    ndk=r10e
 
 Build:1.1.6,1010605
     commit=1.1.6
@@ -537,7 +529,6 @@ Build:1.1.6,1010605
     build=cd ../ && \
         ./compile.sh -a "x86" --release
     buildjni=no
-    ndk=r10e
 
 Build:1.2.0,1020003
     commit=1.2.0
@@ -549,7 +540,6 @@ Build:1.2.0,1020003
     build=cd ../ && \
         ./compile.sh -a "armeabi" --release
     buildjni=no
-    ndk=r10e
 
 Build:1.2.0,1020004
     commit=1.2.0
@@ -561,7 +551,6 @@ Build:1.2.0,1020004
     build=cd ../ && \
         ./compile.sh -a "armeabi-v7a" --release
     buildjni=no
-    ndk=r10e
 
 Build:1.2.0,1020005
     commit=1.2.0
@@ -573,7 +562,6 @@ Build:1.2.0,1020005
     build=cd ../ && \
         ./compile.sh -a "x86" --release
     buildjni=no
-    ndk=r10e
 
 Build:1.2.1,1020103
     commit=1.2.1
@@ -585,7 +573,6 @@ Build:1.2.1,1020103
     build=cd ../ && \
         ./compile.sh -a "armeabi" --release
     buildjni=no
-    ndk=r10e
 
 Build:1.2.1,1020104
     commit=1.2.1
@@ -597,7 +584,6 @@ Build:1.2.1,1020104
     build=cd ../ && \
         ./compile.sh -a "armeabi-v7a" --release
     buildjni=no
-    ndk=r10e
 
 Build:1.2.1,1020105
     commit=1.2.1
@@ -609,7 +595,6 @@ Build:1.2.1,1020105
     build=cd ../ && \
         ./compile.sh -a "x86" --release
     buildjni=no
-    ndk=r10e
 
 Build:1.2.2,1020203
     commit=1.2.2
@@ -621,7 +606,6 @@ Build:1.2.2,1020203
     build=cd ../ && \
         ./compile.sh -a "armeabi" --release
     buildjni=no
-    ndk=r10e
 
 Build:1.2.2,1020204
     commit=1.2.2
@@ -633,7 +617,6 @@ Build:1.2.2,1020204
     build=cd ../ && \
         ./compile.sh -a "armeabi-v7a" --release
     buildjni=no
-    ndk=r10e
 
 Build:1.2.2,1020205
     commit=1.2.2
@@ -645,7 +628,6 @@ Build:1.2.2,1020205
     build=cd ../ && \
         ./compile.sh -a "x86" --release
     buildjni=no
-    ndk=r10e
 
 Build:1.2.3,1020303
     commit=1.2.3
@@ -657,7 +639,6 @@ Build:1.2.3,1020303
     build=cd ../ && \
         ./compile.sh -a "armeabi" --release
     buildjni=no
-    ndk=r10e
 
 Build:1.2.3,1020304
     commit=1.2.3
@@ -669,7 +650,6 @@ Build:1.2.3,1020304
     build=cd ../ && \
         ./compile.sh -a "armeabi-v7a" --release
     buildjni=no
-    ndk=r10e
 
 Build:1.2.3,1020305
     commit=1.2.3
@@ -681,7 +661,6 @@ Build:1.2.3,1020305
     build=cd ../ && \
         ./compile.sh -a "x86" --release
     buildjni=no
-    ndk=r10e
 
 Build:1.2.4,1020403
     commit=1.2.4
@@ -693,7 +672,6 @@ Build:1.2.4,1020403
     build=cd ../ && \
         ./compile.sh -a "armeabi" --release
     buildjni=no
-    ndk=r10e
 
 Build:1.2.4,1020404
     commit=1.2.4
@@ -705,7 +683,6 @@ Build:1.2.4,1020404
     build=cd ../ && \
         ./compile.sh -a "armeabi-v7a" --release
     buildjni=no
-    ndk=r10e
 
 Build:1.2.4,1020405
     commit=1.2.4
@@ -717,7 +694,6 @@ Build:1.2.4,1020405
     build=cd ../ && \
         ./compile.sh -a "x86" --release
     buildjni=no
-    ndk=r10e
 
 Build:1.2.5,1020503
     commit=1.2.5
@@ -729,7 +705,6 @@ Build:1.2.5,1020503
     build=cd ../ && \
         ./compile.sh -a "armeabi" --release
     buildjni=no
-    ndk=r10e
 
 Build:1.2.5,1020504
     commit=1.2.5
@@ -741,7 +716,6 @@ Build:1.2.5,1020504
     build=cd ../ && \
         ./compile.sh -a "armeabi-v7a" --release
     buildjni=no
-    ndk=r10e
 
 Build:1.2.5,1020505
     commit=1.2.5
@@ -753,7 +727,6 @@ Build:1.2.5,1020505
     build=cd ../ && \
         ./compile.sh -a "x86" --release
     buildjni=no
-    ndk=r10e
 
 Build:1.2.6,1030003
     commit=1.2.6
@@ -765,7 +738,6 @@ Build:1.2.6,1030003
     build=cd ../ && \
         ./compile.sh -a "armeabi" --release
     buildjni=no
-    ndk=r10e
 
 Build:1.2.6,1030004
     commit=1.2.6
@@ -777,7 +749,6 @@ Build:1.2.6,1030004
     build=cd ../ && \
         ./compile.sh -a "armeabi-v7a" --release
     buildjni=no
-    ndk=r10e
 
 Build:1.2.6,1030005
     commit=1.2.6
@@ -789,7 +760,6 @@ Build:1.2.6,1030005
     build=cd ../ && \
         ./compile.sh -a "x86" --release
     buildjni=no
-    ndk=r10e
 
 Build:1.3.2,1030203
     commit=1.3.2
@@ -801,7 +771,6 @@ Build:1.3.2,1030203
     build=cd ../ && \
         ./compile.sh -a "armeabi" --release
     buildjni=no
-    ndk=r10e
 
 Build:1.3.2,1030204
     commit=1.3.2
@@ -813,7 +782,6 @@ Build:1.3.2,1030204
     build=cd ../ && \
         ./compile.sh -a "armeabi-v7a" --release
     buildjni=no
-    ndk=r10e
 
 Build:1.3.2,1030205
     commit=1.3.2
@@ -825,7 +793,6 @@ Build:1.3.2,1030205
     build=cd ../ && \
         ./compile.sh -a "x86" --release
     buildjni=no
-    ndk=r10e
 
 Build:1.4.0,1040003
     commit=1.4.0
@@ -837,7 +804,6 @@ Build:1.4.0,1040003
     build=cd ../ && \
         ./compile.sh -a "armeabi" --release
     buildjni=no
-    ndk=r10e
 
 Build:1.4.0,1040004
     commit=1.4.0
@@ -849,7 +815,6 @@ Build:1.4.0,1040004
     build=cd ../ && \
         ./compile.sh -a "armeabi-v7a" --release
     buildjni=no
-    ndk=r10e
 
 Build:1.4.0,1040005
     commit=1.4.0
@@ -861,7 +826,6 @@ Build:1.4.0,1040005
     build=cd ../ && \
         ./compile.sh -a "x86" --release
     buildjni=no
-    ndk=r10e
 
 Build:1.4.1,1040103
     commit=1.4.1
@@ -873,7 +837,6 @@ Build:1.4.1,1040103
     build=cd ../ && \
         ./compile.sh -a "armeabi" --release
     buildjni=no
-    ndk=r10e
 
 Build:1.4.1,1040104
     commit=0276df272b48685821db293eb8bd385eec1ff47f
@@ -885,7 +848,6 @@ Build:1.4.1,1040104
     build=cd ../ && \
         ./compile.sh -a "armeabi-v7a" --release
     buildjni=no
-    ndk=r10e
 
 Build:1.4.1,1040105
     commit=1.4.1
@@ -897,7 +859,6 @@ Build:1.4.1,1040105
     build=cd ../ && \
         ./compile.sh -a "x86" --release
     buildjni=no
-    ndk=r10e
 
 Maintainer Notes:
 Instructions and dependencies here: http://wiki.videolan.org/AndroidCompile
diff --git a/metadata/org.xcsoar.txt b/metadata/org.xcsoar.txt
index 1e3735df7d..038171551a 100644
--- a/metadata/org.xcsoar.txt
+++ b/metadata/org.xcsoar.txt
@@ -68,7 +68,6 @@ Build:6.7.8,97
     build=cd .. && \
         for n in 1 2 3; do make TARGET=ANDROIDFAT DEBUG=n TESTING=n -j4 output/ANDROIDFAT/bin/XCSoar-release-unsigned.apk && \
         break; done
-    ndk=r10e
 
 Build:6.7.9,98
     commit=v6.7.9
@@ -78,7 +77,6 @@ Build:6.7.9,98
     build=cd .. && \
         for n in 1 2 3; do make TARGET=ANDROIDFAT DEBUG=n TESTING=n -j4 output/ANDROIDFAT/bin/XCSoar-release-unsigned.apk && \
         break; done
-    ndk=r10e
 
 Maintainer Notes:
 The makefile setup is not perfect, so we need to run it a few times to get it to succeed.
diff --git a/metadata/se.leap.bitmaskclient.txt b/metadata/se.leap.bitmaskclient.txt
index 16457d0e7b..dd852ab7ba 100644
--- a/metadata/se.leap.bitmaskclient.txt
+++ b/metadata/se.leap.bitmaskclient.txt
@@ -40,7 +40,6 @@ Build:0.9.2RC2,114
     gradle=yes
     build=misc/build-native.sh
     buildjni=no
-    ndk=r10e
 
 Build:0.9.2RC3,115
     disable=does not verify (all ndk-built files)
@@ -49,7 +48,6 @@ Build:0.9.2RC3,115
     gradle=yes
     build=misc/build-native.sh
     buildjni=no
-    ndk=r10e
 
 Build:0.9.2,116
     disable=does not verify (just MIPS)
@@ -58,7 +56,6 @@ Build:0.9.2,116
     gradle=yes
     build=misc/build-native.sh
     buildjni=no
-    ndk=r10e
 
 Build:0.9.3,120
     disable=does not verify (just MIPS, jar-xf/assets/nopievpn.mips and pievpn.mips)
@@ -67,7 +64,6 @@ Build:0.9.3,120
     gradle=yes
     build=misc/build-native.sh
     buildjni=no
-    ndk=r10e
 
 Build:0.9.4,125
     disable=doesnt verify (r10d vs. r10e)
@@ -77,7 +73,6 @@ Build:0.9.4,125
     submodules=yes
     build=misc/build-native.sh
     buildjni=no
-    ndk=r10e
 
 Maintainer Notes:
 0.9.4_FDROID should verify with r10d, but we switched already to r10e...