diff --git a/metadata/org.mozilla.fennec_fdroid.txt b/metadata/org.mozilla.fennec_fdroid.txt
index a92521dbad..77e4514c1f 100644
--- a/metadata/org.mozilla.fennec_fdroid.txt
+++ b/metadata/org.mozilla.fennec_fdroid.txt
@@ -37,10 +37,7 @@ Repo:https://hg.mozilla.org/releases/mozilla-release/
 
 Build:35.0,350000
     commit=FENNEC_35_0_RELEASE
-    srclibs=MozLocales@214c475d
-    output=fdroid/fennec-unsigned.apk
-    init=\
-        rm -R docshell/test/ && \
+    init=rm -R docshell/test/ && \
         rm -R dom/tests/ && \
         rm -R modules/libjar/test/ && \
         rm -R security/manager/ssl/tests/*test/ && \
@@ -54,7 +51,8 @@ Build:35.0,350000
         rm -R toolkit/crashreporter/google-breakpad/src/third_party/linux/ && \
         rm -R toolkit/mozapps/extensions/test/ && \
         rm -R xpcom/tests/
-    scanignore=mobile/android/base/JavaAddonManager.java
+    output=fdroid/fennec-unsigned.apk
+    srclibs=MozLocales@214c475d
     prebuild=mkdir fdroid && \
         l10ndir=`readlink -f $$MozLocales$$` && \
         sed -i -e 's/android:debuggable="true"//g' -e 's/@ANDROID_VERSION_CODE@/350000/g' mobile/android/base/AndroidManifest.xml.in && \
@@ -76,10 +74,11 @@ Build:35.0,350000
         popd && \
         sed -i -e '/MOZ_DEVICES/d' -e '/MOZ_NATIVE_DEVICES/d' mobile/android/confvars.sh && \
         echo -e 'MOZ_DEVICES=0\nMOZ_NATIVE_DEVICES=0\nMOZ_ANDROID_GOOGLE_PLAY_SERVICES=0\n' >> mobile/android/confvars.sh
+    scanignore=mobile/android/base/JavaAddonManager.java
     build=./mach build && \
         fxarch=`grep "ac_add_options --target=" .mozconfig | cut -d '=' -f2` && \
         pushd obj-${fxarch}/mobile/android/locales && \
-          for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
+        for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
         popd && \
         ./mach package && \
         mv obj-${fxarch}/dist/fennec-*.apk fdroid/fennec-unsigned.apk && \
@@ -87,10 +86,7 @@ Build:35.0,350000
 
 Build:35.0,350010
     commit=FENNEC_35_0_RELEASE
-    srclibs=MozLocales@214c475d
-    output=fdroid/fennec-unsigned.apk
-    init=\
-        rm -R docshell/test/ && \
+    init=rm -R docshell/test/ && \
         rm -R dom/tests/ && \
         rm -R modules/libjar/test/ && \
         rm -R security/manager/ssl/tests/*test/ && \
@@ -104,7 +100,8 @@ Build:35.0,350010
         rm -R toolkit/crashreporter/google-breakpad/src/third_party/linux/ && \
         rm -R toolkit/mozapps/extensions/test/ && \
         rm -R xpcom/tests/
-    scanignore=mobile/android/base/JavaAddonManager.java
+    output=fdroid/fennec-unsigned.apk
+    srclibs=MozLocales@214c475d
     prebuild=mkdir fdroid && \
         l10ndir=`readlink -f $$MozLocales$$` && \
         sed -i -e 's/android:debuggable="true"//g' -e 's/@ANDROID_VERSION_CODE@/350010/g' mobile/android/base/AndroidManifest.xml.in && \
@@ -126,10 +123,11 @@ Build:35.0,350010
         popd && \
         sed -i -e '/MOZ_DEVICES/d' -e '/MOZ_NATIVE_DEVICES/d' mobile/android/confvars.sh && \
         echo -e 'MOZ_DEVICES=0\nMOZ_NATIVE_DEVICES=0\nMOZ_ANDROID_GOOGLE_PLAY_SERVICES=0\n' >> mobile/android/confvars.sh
+    scanignore=mobile/android/base/JavaAddonManager.java
     build=./mach build && \
         fxarch=`grep "ac_add_options --target=" .mozconfig | cut -d '=' -f2` && \
         pushd obj-${fxarch}/mobile/android/locales && \
-          for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
+        for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
         popd && \
         ./mach package && \
         mv obj-${fxarch}/dist/fennec-*.apk fdroid/fennec-unsigned.apk && \
@@ -137,10 +135,7 @@ Build:35.0,350010
 
 Build:36.0,360000
     commit=FENNEC_36_0_RELEASE
-    srclibs=MozLocales@11c8e4b7b332e466f72df2fb7a340ec8143b1135
-    output=fdroid/fennec-unsigned.apk
-    init=\
-        rm -R docshell/test/ && \
+    init=rm -R docshell/test/ && \
         rm -R dom/tests/ && \
         rm -R modules/libjar/test/ && \
         rm -R security/manager/ssl/tests/*test/ && \
@@ -154,12 +149,11 @@ Build:36.0,360000
         rm -R toolkit/crashreporter/google-breakpad/src/third_party/linux/ && \
         rm -R toolkit/mozapps/extensions/test/ && \
         rm -R xpcom/tests/
-    scanignore=mobile/android/base/JavaAddonManager.java
+    output=fdroid/fennec-unsigned.apk
+    srclibs=MozLocales@11c8e4b7b332e466f72df2fb7a340ec8143b1135
     prebuild=mkdir fdroid && \
         l10ndir=`readlink -f $$MozLocales$$` && \
-        sed -i -e 's/android:debuggable="true"//g' \
-               -e 's/@ANDROID_VERSION_CODE@/360000/g' \
-               mobile/android/base/AndroidManifest.xml.in && \
+        sed -i -e 's/android:debuggable="true"//g' -e 's/@ANDROID_VERSION_CODE@/360000/g' mobile/android/base/AndroidManifest.xml.in && \
         sed -i -e '/MOZ_ANDROID_GOOGLE_PLAY_SERVICES/d' configure.in && \
         echo "ac_add_options --with-android-ndk=\"$$NDK$$\"" > .mozconfig && \
         echo "ac_add_options --with-android-sdk=\"$$SDK$$/platforms/android-21\"" >> .mozconfig && \
@@ -184,10 +178,11 @@ Build:36.0,360000
         sed -i -e '/MOZ_WIDGET_TOOLKIT/,+2d' build/stlport/moz.build && \
         rm -R mobile/android/gradle/ && \
         sed -i -e '/gradle/d' mobile/android/moz.build
+    scanignore=mobile/android/base/JavaAddonManager.java
     build=./mach build && \
         fxarch=`grep "ac_add_options --target=" .mozconfig | cut -d '=' -f2` && \
         pushd obj-${fxarch}/mobile/android/locales && \
-          for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
+        for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
         popd && \
         ./mach package && \
         mv obj-${fxarch}/dist/fennec-*.apk fdroid/fennec-unsigned.apk && \
@@ -195,10 +190,7 @@ Build:36.0,360000
 
 Build:36.0,360010
     commit=FENNEC_36_0_RELEASE
-    srclibs=MozLocales@11c8e4b7b332e466f72df2fb7a340ec8143b1135
-    output=fdroid/fennec-unsigned.apk
-    init=\
-        rm -R docshell/test/ && \
+    init=rm -R docshell/test/ && \
         rm -R dom/tests/ && \
         rm -R modules/libjar/test/ && \
         rm -R security/manager/ssl/tests/*test/ && \
@@ -212,12 +204,11 @@ Build:36.0,360010
         rm -R toolkit/crashreporter/google-breakpad/src/third_party/linux/ && \
         rm -R toolkit/mozapps/extensions/test/ && \
         rm -R xpcom/tests/
-    scanignore=mobile/android/base/JavaAddonManager.java
+    output=fdroid/fennec-unsigned.apk
+    srclibs=MozLocales@11c8e4b7b332e466f72df2fb7a340ec8143b1135
     prebuild=mkdir fdroid && \
         l10ndir=`readlink -f $$MozLocales$$` && \
-        sed -i -e 's/android:debuggable="true"//g' \
-               -e 's/@ANDROID_VERSION_CODE@/360010/g' \
-               mobile/android/base/AndroidManifest.xml.in && \
+        sed -i -e 's/android:debuggable="true"//g' -e 's/@ANDROID_VERSION_CODE@/360010/g' mobile/android/base/AndroidManifest.xml.in && \
         sed -i -e '/MOZ_ANDROID_GOOGLE_PLAY_SERVICES/d' configure.in && \
         echo "ac_add_options --with-android-ndk=\"$$NDK$$\"" > .mozconfig && \
         echo "ac_add_options --with-android-sdk=\"$$SDK$$/platforms/android-21\"" >> .mozconfig && \
@@ -242,10 +233,11 @@ Build:36.0,360010
         sed -i -e '/MOZ_WIDGET_TOOLKIT/,+2d' build/stlport/moz.build && \
         rm -R mobile/android/gradle/ && \
         sed -i -e '/gradle/d' mobile/android/moz.build
+    scanignore=mobile/android/base/JavaAddonManager.java
     build=./mach build && \
         fxarch=`grep "ac_add_options --target=" .mozconfig | cut -d '=' -f2` && \
         pushd obj-${fxarch}/mobile/android/locales && \
-          for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
+        for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
         popd && \
         ./mach package && \
         mv obj-${fxarch}/dist/fennec-*.apk fdroid/fennec-unsigned.apk && \
@@ -253,10 +245,7 @@ Build:36.0,360010
 
 Build:36.0.1,360100
     commit=FENNEC_36_0_1_RELEASE
-    srclibs=MozLocales@11c8e4b7b332e466f72df2fb7a340ec8143b1135
-    output=fdroid/fennec-unsigned.apk
-    init=\
-        rm -R docshell/test/ && \
+    init=rm -R docshell/test/ && \
         rm -R dom/tests/ && \
         rm -R modules/libjar/test/ && \
         rm -R security/manager/ssl/tests/*test/ && \
@@ -270,7 +259,8 @@ Build:36.0.1,360100
         rm -R toolkit/crashreporter/google-breakpad/src/third_party/linux/ && \
         rm -R toolkit/mozapps/extensions/test/ && \
         rm -R xpcom/tests/
-    scanignore=mobile/android/base/JavaAddonManager.java
+    output=fdroid/fennec-unsigned.apk
+    srclibs=MozLocales@11c8e4b7b332e466f72df2fb7a340ec8143b1135
     prebuild=mkdir fdroid && \
         vercode=360100 && \
         fxarch=arm-linux-androideabi && \
@@ -302,10 +292,11 @@ Build:36.0.1,360100
         sed -i -e '/MOZ_WIDGET_TOOLKIT/,+2d' build/stlport/moz.build && \
         rm -R mobile/android/gradle/ && \
         sed -i -e '/gradle/d' mobile/android/moz.build
+    scanignore=mobile/android/base/JavaAddonManager.java
     build=./mach build && \
         fxarch=`grep "ac_add_options --target=" .mozconfig | cut -d '=' -f2` && \
         pushd obj-${fxarch}/mobile/android/locales && \
-          for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
+        for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
         popd && \
         ./mach package && \
         mv obj-${fxarch}/dist/fennec-*.apk fdroid/fennec-unsigned.apk && \
@@ -313,10 +304,7 @@ Build:36.0.1,360100
 
 Build:36.0.1,360110
     commit=FENNEC_36_0_1_RELEASE
-    srclibs=MozLocales@11c8e4b7b332e466f72df2fb7a340ec8143b1135
-    output=fdroid/fennec-unsigned.apk
-    init=\
-        rm -R docshell/test/ && \
+    init=rm -R docshell/test/ && \
         rm -R dom/tests/ && \
         rm -R modules/libjar/test/ && \
         rm -R security/manager/ssl/tests/*test/ && \
@@ -330,7 +318,8 @@ Build:36.0.1,360110
         rm -R toolkit/crashreporter/google-breakpad/src/third_party/linux/ && \
         rm -R toolkit/mozapps/extensions/test/ && \
         rm -R xpcom/tests/
-    scanignore=mobile/android/base/JavaAddonManager.java
+    output=fdroid/fennec-unsigned.apk
+    srclibs=MozLocales@11c8e4b7b332e466f72df2fb7a340ec8143b1135
     prebuild=mkdir fdroid && \
         vercode=360110 && \
         fxarch=i386-linux-android && \
@@ -362,10 +351,11 @@ Build:36.0.1,360110
         sed -i -e '/MOZ_WIDGET_TOOLKIT/,+2d' build/stlport/moz.build && \
         rm -R mobile/android/gradle/ && \
         sed -i -e '/gradle/d' mobile/android/moz.build
+    scanignore=mobile/android/base/JavaAddonManager.java
     build=./mach build && \
         fxarch=`grep "ac_add_options --target=" .mozconfig | cut -d '=' -f2` && \
         pushd obj-${fxarch}/mobile/android/locales && \
-          for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
+        for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
         popd && \
         ./mach package && \
         mv obj-${fxarch}/dist/fennec-*.apk fdroid/fennec-unsigned.apk && \
@@ -373,11 +363,10 @@ Build:36.0.1,360110
 
 Build:36.0.4,360400
     commit=FENNEC_36_0_4_RELEASE
-    srclibs=MozLocales@11c8e4b7b332e466f72df2fb7a340ec8143b1135
-    output=fdroid/fennec-unsigned.apk
     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
+    output=fdroid/fennec-unsigned.apk
+    srclibs=MozLocales@11c8e4b7b332e466f72df2fb7a340ec8143b1135
     prebuild=mkdir fdroid && \
         vercode=360400 && \
         fxarch=arm-linux-androideabi && \
@@ -409,10 +398,11 @@ Build:36.0.4,360400
         sed -i -e '/MOZ_WIDGET_TOOLKIT/,+2d' build/stlport/moz.build && \
         rm -R mobile/android/gradle/ && \
         sed -i -e '/gradle/d' mobile/android/moz.build
+    scanignore=mobile/android/base/JavaAddonManager.java
     build=./mach build && \
         fxarch=`grep "ac_add_options --target=" .mozconfig | cut -d '=' -f2` && \
         pushd obj-${fxarch}/mobile/android/locales && \
-          for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
+        for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
         popd && \
         ./mach package && \
         mv obj-${fxarch}/dist/fennec-*.apk fdroid/fennec-unsigned.apk && \
@@ -420,11 +410,10 @@ Build:36.0.4,360400
 
 Build:36.0.4,360410
     commit=FENNEC_36_0_4_RELEASE
-    srclibs=MozLocales@11c8e4b7b332e466f72df2fb7a340ec8143b1135
-    output=fdroid/fennec-unsigned.apk
     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
+    output=fdroid/fennec-unsigned.apk
+    srclibs=MozLocales@11c8e4b7b332e466f72df2fb7a340ec8143b1135
     prebuild=mkdir fdroid && \
         vercode=360410 && \
         fxarch=i386-linux-android && \
@@ -456,10 +445,11 @@ Build:36.0.4,360410
         sed -i -e '/MOZ_WIDGET_TOOLKIT/,+2d' build/stlport/moz.build && \
         rm -R mobile/android/gradle/ && \
         sed -i -e '/gradle/d' mobile/android/moz.build
+    scanignore=mobile/android/base/JavaAddonManager.java
     build=./mach build && \
         fxarch=`grep "ac_add_options --target=" .mozconfig | cut -d '=' -f2` && \
         pushd obj-${fxarch}/mobile/android/locales && \
-          for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
+        for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
         popd && \
         ./mach package && \
         mv obj-${fxarch}/dist/fennec-*.apk fdroid/fennec-unsigned.apk && \
@@ -467,11 +457,10 @@ Build:36.0.4,360410
 
 Build:37.0,370000
     commit=FENNEC_37_0_RELEASE
-    srclibs=MozLocales@a7219763
-    output=fdroid/fennec-unsigned.apk
     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
+    output=fdroid/fennec-unsigned.apk
+    srclibs=MozLocales@a7219763
     prebuild=mkdir fdroid && \
         vercode=370000 && \
         fxarch=arm-linux-androideabi && \
@@ -501,10 +490,11 @@ Build:37.0,370000
         sed -i -e '/MOZ_WIDGET_TOOLKIT/,+2d' build/stlport/moz.build && \
         rm -R mobile/android/gradle/ && \
         sed -i -e '/gradle/d' mobile/android/moz.build
+    scanignore=mobile/android/base/JavaAddonManager.java
     build=./mach build && \
         fxarch=`grep "ac_add_options --target=" .mozconfig | cut -d '=' -f2` && \
         pushd obj-${fxarch}/mobile/android/locales && \
-          for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
+        for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
         popd && \
         ./mach package && \
         mv obj-${fxarch}/dist/fennec-*.apk fdroid/fennec-unsigned.apk && \
@@ -512,11 +502,10 @@ Build:37.0,370000
 
 Build:37.0,370010
     commit=FENNEC_37_0_RELEASE
-    srclibs=MozLocales@a7219763
-    output=fdroid/fennec-unsigned.apk
     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
+    output=fdroid/fennec-unsigned.apk
+    srclibs=MozLocales@a7219763
     prebuild=mkdir fdroid && \
         vercode=370010 && \
         fxarch=i386-linux-android && \
@@ -546,10 +535,11 @@ Build:37.0,370010
         sed -i -e '/MOZ_WIDGET_TOOLKIT/,+2d' build/stlport/moz.build && \
         rm -R mobile/android/gradle/ && \
         sed -i -e '/gradle/d' mobile/android/moz.build
+    scanignore=mobile/android/base/JavaAddonManager.java
     build=./mach build && \
         fxarch=`grep "ac_add_options --target=" .mozconfig | cut -d '=' -f2` && \
         pushd obj-${fxarch}/mobile/android/locales && \
-          for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
+        for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
         popd && \
         ./mach package && \
         mv obj-${fxarch}/dist/fennec-*.apk fdroid/fennec-unsigned.apk && \
@@ -557,11 +547,10 @@ Build:37.0,370010
 
 Build:37.0.1,370100
     commit=FENNEC_37_0_1_RELEASE
-    srclibs=MozLocales@a7219763
-    output=fdroid/fennec-unsigned.apk
     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
+    output=fdroid/fennec-unsigned.apk
+    srclibs=MozLocales@a7219763
     prebuild=mkdir fdroid && \
         vercode=370100 && \
         fxarch=arm-linux-androideabi && \
@@ -591,10 +580,11 @@ Build:37.0.1,370100
         sed -i -e '/MOZ_WIDGET_TOOLKIT/,+2d' build/stlport/moz.build && \
         rm -R mobile/android/gradle/ && \
         sed -i -e '/gradle/d' mobile/android/moz.build
+    scanignore=mobile/android/base/JavaAddonManager.java
     build=./mach build && \
         fxarch=`grep "ac_add_options --target=" .mozconfig | cut -d '=' -f2` && \
         pushd obj-${fxarch}/mobile/android/locales && \
-          for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
+        for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
         popd && \
         ./mach package && \
         mv obj-${fxarch}/dist/fennec-*.apk fdroid/fennec-unsigned.apk && \
@@ -602,11 +592,10 @@ Build:37.0.1,370100
 
 Build:37.0.1,370110
     commit=FENNEC_37_0_1_RELEASE
-    srclibs=MozLocales@a7219763
-    output=fdroid/fennec-unsigned.apk
     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
+    output=fdroid/fennec-unsigned.apk
+    srclibs=MozLocales@a7219763
     prebuild=mkdir fdroid && \
         vercode=370110 && \
         fxarch=i386-linux-android && \
@@ -636,10 +625,11 @@ Build:37.0.1,370110
         sed -i -e '/MOZ_WIDGET_TOOLKIT/,+2d' build/stlport/moz.build && \
         rm -R mobile/android/gradle/ && \
         sed -i -e '/gradle/d' mobile/android/moz.build
+    scanignore=mobile/android/base/JavaAddonManager.java
     build=./mach build && \
         fxarch=`grep "ac_add_options --target=" .mozconfig | cut -d '=' -f2` && \
         pushd obj-${fxarch}/mobile/android/locales && \
-          for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
+        for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
         popd && \
         ./mach package && \
         mv obj-${fxarch}/dist/fennec-*.apk fdroid/fennec-unsigned.apk && \
@@ -647,11 +637,10 @@ Build:37.0.1,370110
 
 Build:37.0.2,370200
     commit=FENNEC_37_0_2_RELEASE
-    srclibs=MozLocales@a7219763
-    output=fdroid/fennec-unsigned.apk
     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
+    output=fdroid/fennec-unsigned.apk
+    srclibs=MozLocales@a7219763
     prebuild=mkdir fdroid && \
         vercode=370200 && \
         fxarch=arm-linux-androideabi && \
@@ -681,10 +670,11 @@ Build:37.0.2,370200
         sed -i -e '/MOZ_WIDGET_TOOLKIT/,+2d' build/stlport/moz.build && \
         rm -R mobile/android/gradle/ && \
         sed -i -e '/gradle/d' mobile/android/moz.build
+    scanignore=mobile/android/base/JavaAddonManager.java
     build=./mach build && \
         fxarch=`grep "ac_add_options --target=" .mozconfig | cut -d '=' -f2` && \
         pushd obj-${fxarch}/mobile/android/locales && \
-          for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
+        for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
         popd && \
         ./mach package && \
         mv obj-${fxarch}/dist/fennec-*.apk fdroid/fennec-unsigned.apk && \
@@ -692,11 +682,10 @@ Build:37.0.2,370200
 
 Build:37.0.2,370210
     commit=FENNEC_37_0_2_RELEASE
-    srclibs=MozLocales@a7219763
-    output=fdroid/fennec-unsigned.apk
     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
+    output=fdroid/fennec-unsigned.apk
+    srclibs=MozLocales@a7219763
     prebuild=mkdir fdroid && \
         vercode=370210 && \
         fxarch=i386-linux-android && \
@@ -726,10 +715,11 @@ Build:37.0.2,370210
         sed -i -e '/MOZ_WIDGET_TOOLKIT/,+2d' build/stlport/moz.build && \
         rm -R mobile/android/gradle/ && \
         sed -i -e '/gradle/d' mobile/android/moz.build
+    scanignore=mobile/android/base/JavaAddonManager.java
     build=./mach build && \
         fxarch=`grep "ac_add_options --target=" .mozconfig | cut -d '=' -f2` && \
         pushd obj-${fxarch}/mobile/android/locales && \
-          for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
+        for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
         popd && \
         ./mach package && \
         mv obj-${fxarch}/dist/fennec-*.apk fdroid/fennec-unsigned.apk && \
@@ -737,8 +727,6 @@ Build:37.0.2,370210
 
 Build:38.0,380000
     commit=FENNEC_38_0_RELEASE
-    srclibs=MozLocales@a7219763
-    output=fdroid/fennec-unsigned.apk
     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 && \
@@ -758,7 +746,8 @@ Build:38.0,380000
         sed -i -e '/MOCHITEST/,+5d' toolkit/devtools/apps/moz.build && \
         sed -i -e '/tests\//d' toolkit/modules/moz.build && \
         sed -i -e '/tests/d' toolkit/mozapps/update/moz.build
-    scanignore=mobile/android/base/JavaAddonManager.java
+    output=fdroid/fennec-unsigned.apk
+    srclibs=MozLocales@a7219763
     prebuild=mkdir fdroid && \
         fxarch=arm-linux-androideabi && \
         l10ndir=`readlink -f $$MozLocales$$` && \
@@ -795,20 +784,18 @@ Build:38.0,380000
         echo 'pref("media.gmp-gmpopenh264.enabled", false);' >> mobile/android/app/mobile.js && \
         sed -i -e '/casting.enabled/d' mobile/android/app/mobile.js && \
         echo 'pref("browser.casting.enabled", false);' >> mobile/android/app/mobile.js
+    scanignore=mobile/android/base/JavaAddonManager.java
     build=./mach build && \
         fxarch=`grep "ac_add_options --target=" .mozconfig | cut -d '=' -f2` && \
         pushd obj-${fxarch}/mobile/android/locales && \
-          for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
+        for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
         popd && \
         ./mach package && \
         mv obj-${fxarch}/dist/fennec-*.apk fdroid/fennec-unsigned.apk && \
         zip -d fdroid/fennec-unsigned.apk "META-INF*"
 
-
 Build:38.0,380010
     commit=FENNEC_38_0_RELEASE
-    srclibs=MozLocales@a7219763
-    output=fdroid/fennec-unsigned.apk
     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 && \
@@ -828,7 +815,8 @@ Build:38.0,380010
         sed -i -e '/MOCHITEST/,+5d' toolkit/devtools/apps/moz.build && \
         sed -i -e '/tests\//d' toolkit/modules/moz.build && \
         sed -i -e '/tests/d' toolkit/mozapps/update/moz.build
-    scanignore=mobile/android/base/JavaAddonManager.java
+    output=fdroid/fennec-unsigned.apk
+    srclibs=MozLocales@a7219763
     prebuild=mkdir fdroid && \
         fxarch=i386-linux-androideabi && \
         l10ndir=`readlink -f $$MozLocales$$` && \
@@ -865,10 +853,11 @@ Build:38.0,380010
         echo 'pref("media.gmp-gmpopenh264.enabled", false);' >> mobile/android/app/mobile.js && \
         sed -i -e '/casting.enabled/d' mobile/android/app/mobile.js && \
         echo 'pref("browser.casting.enabled", false);' >> mobile/android/app/mobile.js
+    scanignore=mobile/android/base/JavaAddonManager.java
     build=./mach build && \
         fxarch=`grep "ac_add_options --target=" .mozconfig | cut -d '=' -f2` && \
         pushd obj-${fxarch}/mobile/android/locales && \
-          for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
+        for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
         popd && \
         ./mach package && \
         mv obj-${fxarch}/dist/fennec-*.apk fdroid/fennec-unsigned.apk && \
@@ -876,8 +865,6 @@ Build:38.0,380010
 
 Build:38.0.1,380100
     commit=FENNEC_38_0_1_RELEASE
-    srclibs=MozLocales@a7219763
-    output=fdroid/fennec-unsigned.apk
     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 && \
@@ -897,7 +884,8 @@ Build:38.0.1,380100
         sed -i -e '/MOCHITEST/,+5d' toolkit/devtools/apps/moz.build && \
         sed -i -e '/tests\//d' toolkit/modules/moz.build && \
         sed -i -e '/tests/d' toolkit/mozapps/update/moz.build
-    scanignore=mobile/android/base/JavaAddonManager.java
+    output=fdroid/fennec-unsigned.apk
+    srclibs=MozLocales@a7219763
     prebuild=mkdir fdroid && \
         fxarch=arm-linux-androideabi && \
         l10ndir=`readlink -f $$MozLocales$$` && \
@@ -934,10 +922,11 @@ Build:38.0.1,380100
         echo 'pref("media.gmp-gmpopenh264.enabled", false);' >> mobile/android/app/mobile.js && \
         sed -i -e '/casting.enabled/d' mobile/android/app/mobile.js && \
         echo 'pref("browser.casting.enabled", false);' >> mobile/android/app/mobile.js
+    scanignore=mobile/android/base/JavaAddonManager.java
     build=./mach build && \
         fxarch=`grep "ac_add_options --target=" .mozconfig | cut -d '=' -f2` && \
         pushd obj-${fxarch}/mobile/android/locales && \
-          for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
+        for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
         popd && \
         ./mach package && \
         mv obj-${fxarch}/dist/fennec-*.apk fdroid/fennec-unsigned.apk && \
@@ -945,8 +934,6 @@ Build:38.0.1,380100
 
 Build:38.0.1,380110
     commit=FENNEC_38_0_1_RELEASE
-    srclibs=MozLocales@a7219763
-    output=fdroid/fennec-unsigned.apk
     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 && \
@@ -966,7 +953,8 @@ Build:38.0.1,380110
         sed -i -e '/MOCHITEST/,+5d' toolkit/devtools/apps/moz.build && \
         sed -i -e '/tests\//d' toolkit/modules/moz.build && \
         sed -i -e '/tests/d' toolkit/mozapps/update/moz.build
-    scanignore=mobile/android/base/JavaAddonManager.java
+    output=fdroid/fennec-unsigned.apk
+    srclibs=MozLocales@a7219763
     prebuild=mkdir fdroid && \
         fxarch=i386-linux-androideabi && \
         l10ndir=`readlink -f $$MozLocales$$` && \
@@ -1003,10 +991,11 @@ Build:38.0.1,380110
         echo 'pref("media.gmp-gmpopenh264.enabled", false);' >> mobile/android/app/mobile.js && \
         sed -i -e '/casting.enabled/d' mobile/android/app/mobile.js && \
         echo 'pref("browser.casting.enabled", false);' >> mobile/android/app/mobile.js
+    scanignore=mobile/android/base/JavaAddonManager.java
     build=./mach build && \
         fxarch=`grep "ac_add_options --target=" .mozconfig | cut -d '=' -f2` && \
         pushd obj-${fxarch}/mobile/android/locales && \
-          for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
+        for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
         popd && \
         ./mach package && \
         mv obj-${fxarch}/dist/fennec-*.apk fdroid/fennec-unsigned.apk && \
@@ -1014,8 +1003,6 @@ Build:38.0.1,380110
 
 Build:38.0.5,380500
     commit=FENNEC_38_0_5_RELEASE
-    srclibs=MozLocales@a7219763
-    output=fdroid/fennec-unsigned.apk
     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 && \
@@ -1035,7 +1022,8 @@ Build:38.0.5,380500
         sed -i -e '/MOCHITEST/,+5d' toolkit/devtools/apps/moz.build && \
         sed -i -e '/tests\//d' toolkit/modules/moz.build && \
         sed -i -e '/tests/d' toolkit/mozapps/update/moz.build
-    scanignore=mobile/android/base/JavaAddonManager.java
+    output=fdroid/fennec-unsigned.apk
+    srclibs=MozLocales@a7219763
     prebuild=mkdir fdroid && \
         fxarch=arm-linux-androideabi && \
         l10ndir=`readlink -f $$MozLocales$$` && \
@@ -1072,10 +1060,11 @@ Build:38.0.5,380500
         echo 'pref("media.gmp-gmpopenh264.enabled", false);' >> mobile/android/app/mobile.js && \
         sed -i -e '/casting.enabled/d' mobile/android/app/mobile.js && \
         echo 'pref("browser.casting.enabled", false);' >> mobile/android/app/mobile.js
+    scanignore=mobile/android/base/JavaAddonManager.java
     build=./mach build && \
         fxarch=`grep "ac_add_options --target=" .mozconfig | cut -d '=' -f2` && \
         pushd obj-${fxarch}/mobile/android/locales && \
-          for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
+        for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
         popd && \
         ./mach package && \
         mv obj-${fxarch}/dist/fennec-*.apk fdroid/fennec-unsigned.apk && \
@@ -1083,8 +1072,6 @@ Build:38.0.5,380500
 
 Build:38.0.5,380510
     commit=FENNEC_38_0_5_RELEASE
-    srclibs=MozLocales@a7219763
-    output=fdroid/fennec-unsigned.apk
     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 && \
@@ -1104,7 +1091,8 @@ Build:38.0.5,380510
         sed -i -e '/MOCHITEST/,+5d' toolkit/devtools/apps/moz.build && \
         sed -i -e '/tests\//d' toolkit/modules/moz.build && \
         sed -i -e '/tests/d' toolkit/mozapps/update/moz.build
-    scanignore=mobile/android/base/JavaAddonManager.java
+    output=fdroid/fennec-unsigned.apk
+    srclibs=MozLocales@a7219763
     prebuild=mkdir fdroid && \
         fxarch=i386-linux-androideabi && \
         l10ndir=`readlink -f $$MozLocales$$` && \
@@ -1141,10 +1129,11 @@ Build:38.0.5,380510
         echo 'pref("media.gmp-gmpopenh264.enabled", false);' >> mobile/android/app/mobile.js && \
         sed -i -e '/casting.enabled/d' mobile/android/app/mobile.js && \
         echo 'pref("browser.casting.enabled", false);' >> mobile/android/app/mobile.js
+    scanignore=mobile/android/base/JavaAddonManager.java
     build=./mach build && \
         fxarch=`grep "ac_add_options --target=" .mozconfig | cut -d '=' -f2` && \
         pushd obj-${fxarch}/mobile/android/locales && \
-          for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
+        for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
         popd && \
         ./mach package && \
         mv obj-${fxarch}/dist/fennec-*.apk fdroid/fennec-unsigned.apk && \
@@ -1152,10 +1141,7 @@ Build:38.0.5,380510
 
 Build:39.0,390000
     commit=FENNEC_39_0_RELEASE
-    srclibs=MozLocales@06bd272337dc1ffe7255982e4f7643b6bfcfd774
-    output=fdroid/fennec-unsigned.apk
-    init=\
-        find toolkit/crashreporter/ -mindepth 1 -maxdepth 1 ! -name "crashreporter.mozbuild" ! -name "google-breakpad" -exec rm -R '{}' \; && \
+    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 '{}' \; && \
         rm -R toolkit/crashreporter/google-breakpad/src/tools/ && \
         rm -R toolkit/crashreporter/google-breakpad/src/client/ && \
@@ -1223,7 +1209,8 @@ Build:39.0,390000
         sed -i -e '/MOCHITEST/,+5d' toolkit/devtools/apps/moz.build && \
         sed -i -e '/tests\//d' toolkit/modules/moz.build && \
         sed -i -e '/tests/d' toolkit/mozapps/update/moz.build
-    scanignore=mobile/android/base/JavaAddonManager.java
+    output=fdroid/fennec-unsigned.apk
+    srclibs=MozLocales@06bd272337dc1ffe7255982e4f7643b6bfcfd774
     prebuild=mkdir fdroid && \
         fxarch=arm-linux-androideabi && \
         l10ndir=`readlink -f $$MozLocales$$` && \
@@ -1263,10 +1250,11 @@ Build:39.0,390000
         echo "==HEALTHREPORTER==" && \
         sed -i -e '/datareporting.healthreport.uploadEnabled/s/true/false/g' -e '/datareporting.healthreport.service.enabled/s/true/false/g' ./services/healthreport/healthreport-prefs.js && \
         sed -i -e '/android.not_a_preference.healthreport.uploadEnabled/,+3s/android:defaultValue="true"/android:defaultValue="false"/g' mobile/android/base/resources/xml/preferences_vendor.xml
+    scanignore=mobile/android/base/JavaAddonManager.java
     build=./mach build && \
         fxarch=`grep "ac_add_options --target=" .mozconfig | cut -d '=' -f2` && \
         pushd obj-${fxarch}/mobile/android/locales && \
-          for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
+        for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
         popd && \
         ./mach package && \
         mv obj-${fxarch}/dist/fennec-*.apk fdroid/fennec-unsigned.apk && \
@@ -1274,10 +1262,7 @@ Build:39.0,390000
 
 Build:39.0,390010
     commit=FENNEC_39_0_RELEASE
-    srclibs=MozLocales@06bd272337dc1ffe7255982e4f7643b6bfcfd774
-    output=fdroid/fennec-unsigned.apk
-    init=\
-        find toolkit/crashreporter/ -mindepth 1 -maxdepth 1 ! -name "crashreporter.mozbuild" ! -name "google-breakpad" -exec rm -R '{}' \; && \
+    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 '{}' \; && \
         rm -R toolkit/crashreporter/google-breakpad/src/tools/ && \
         rm -R toolkit/crashreporter/google-breakpad/src/client/ && \
@@ -1345,7 +1330,8 @@ Build:39.0,390010
         sed -i -e '/MOCHITEST/,+5d' toolkit/devtools/apps/moz.build && \
         sed -i -e '/tests\//d' toolkit/modules/moz.build && \
         sed -i -e '/tests/d' toolkit/mozapps/update/moz.build
-    scanignore=mobile/android/base/JavaAddonManager.java
+    output=fdroid/fennec-unsigned.apk
+    srclibs=MozLocales@06bd272337dc1ffe7255982e4f7643b6bfcfd774
     prebuild=mkdir fdroid && \
         fxarch=i386-linux-androideabi && \
         l10ndir=`readlink -f $$MozLocales$$` && \
@@ -1385,10 +1371,11 @@ Build:39.0,390010
         echo "==HEALTHREPORTER==" && \
         sed -i -e '/datareporting.healthreport.uploadEnabled/s/true/false/g' -e '/datareporting.healthreport.service.enabled/s/true/false/g' ./services/healthreport/healthreport-prefs.js && \
         sed -i -e '/android.not_a_preference.healthreport.uploadEnabled/,+3s/android:defaultValue="true"/android:defaultValue="false"/g' mobile/android/base/resources/xml/preferences_vendor.xml
+    scanignore=mobile/android/base/JavaAddonManager.java
     build=./mach build && \
         fxarch=`grep "ac_add_options --target=" .mozconfig | cut -d '=' -f2` && \
         pushd obj-${fxarch}/mobile/android/locales && \
-          for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
+        for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
         popd && \
         ./mach package && \
         mv obj-${fxarch}/dist/fennec-*.apk fdroid/fennec-unsigned.apk && \
@@ -1396,10 +1383,7 @@ Build:39.0,390010
 
 Build:39.0.1,390100
     commit=FENNEC_39_0_1_RELEASE
-    srclibs=MozLocales@06bd272337dc1ffe7255982e4f7643b6bfcfd774
-    output=fdroid/fennec-unsigned.apk
-    init=\
-        find toolkit/crashreporter/ -mindepth 1 -maxdepth 1 ! -name "crashreporter.mozbuild" ! -name "google-breakpad" -exec rm -R '{}' \; && \
+    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 '{}' \; && \
         rm -R toolkit/crashreporter/google-breakpad/src/tools/ && \
         rm -R toolkit/crashreporter/google-breakpad/src/client/ && \
@@ -1467,7 +1451,8 @@ Build:39.0.1,390100
         sed -i -e '/MOCHITEST/,+5d' toolkit/devtools/apps/moz.build && \
         sed -i -e '/tests\//d' toolkit/modules/moz.build && \
         sed -i -e '/tests/d' toolkit/mozapps/update/moz.build
-    scanignore=mobile/android/base/JavaAddonManager.java
+    output=fdroid/fennec-unsigned.apk
+    srclibs=MozLocales@06bd272337dc1ffe7255982e4f7643b6bfcfd774
     prebuild=mkdir fdroid && \
         fxarch=arm-linux-androideabi && \
         l10ndir=`readlink -f $$MozLocales$$` && \
@@ -1507,10 +1492,11 @@ Build:39.0.1,390100
         echo "==HEALTHREPORTER==" && \
         sed -i -e '/datareporting.healthreport.uploadEnabled/s/true/false/g' -e '/datareporting.healthreport.service.enabled/s/true/false/g' ./services/healthreport/healthreport-prefs.js && \
         sed -i -e '/android.not_a_preference.healthreport.uploadEnabled/,+3s/android:defaultValue="true"/android:defaultValue="false"/g' mobile/android/base/resources/xml/preferences_vendor.xml
+    scanignore=mobile/android/base/JavaAddonManager.java
     build=./mach build && \
         fxarch=`grep "ac_add_options --target=" .mozconfig | cut -d '=' -f2` && \
         pushd obj-${fxarch}/mobile/android/locales && \
-          for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
+        for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
         popd && \
         ./mach package && \
         mv obj-${fxarch}/dist/fennec-*.apk fdroid/fennec-unsigned.apk && \
@@ -1518,10 +1504,7 @@ Build:39.0.1,390100
 
 Build:39.0.1,390110
     commit=FENNEC_39_0_1_RELEASE
-    srclibs=MozLocales@06bd272337dc1ffe7255982e4f7643b6bfcfd774
-    output=fdroid/fennec-unsigned.apk
-    init=\
-        find toolkit/crashreporter/ -mindepth 1 -maxdepth 1 ! -name "crashreporter.mozbuild" ! -name "google-breakpad" -exec rm -R '{}' \; && \
+    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 '{}' \; && \
         rm -R toolkit/crashreporter/google-breakpad/src/tools/ && \
         rm -R toolkit/crashreporter/google-breakpad/src/client/ && \
@@ -1589,7 +1572,8 @@ Build:39.0.1,390110
         sed -i -e '/MOCHITEST/,+5d' toolkit/devtools/apps/moz.build && \
         sed -i -e '/tests\//d' toolkit/modules/moz.build && \
         sed -i -e '/tests/d' toolkit/mozapps/update/moz.build
-    scanignore=mobile/android/base/JavaAddonManager.java
+    output=fdroid/fennec-unsigned.apk
+    srclibs=MozLocales@06bd272337dc1ffe7255982e4f7643b6bfcfd774
     prebuild=mkdir fdroid && \
         fxarch=i386-linux-androideabi && \
         l10ndir=`readlink -f $$MozLocales$$` && \
@@ -1629,10 +1613,11 @@ Build:39.0.1,390110
         echo "==HEALTHREPORTER==" && \
         sed -i -e '/datareporting.healthreport.uploadEnabled/s/true/false/g' -e '/datareporting.healthreport.service.enabled/s/true/false/g' ./services/healthreport/healthreport-prefs.js && \
         sed -i -e '/android.not_a_preference.healthreport.uploadEnabled/,+3s/android:defaultValue="true"/android:defaultValue="false"/g' mobile/android/base/resources/xml/preferences_vendor.xml
+    scanignore=mobile/android/base/JavaAddonManager.java
     build=./mach build && \
         fxarch=`grep "ac_add_options --target=" .mozconfig | cut -d '=' -f2` && \
         pushd obj-${fxarch}/mobile/android/locales && \
-          for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
+        for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
         popd && \
         ./mach package && \
         mv obj-${fxarch}/dist/fennec-*.apk fdroid/fennec-unsigned.apk && \
@@ -1640,10 +1625,7 @@ Build:39.0.1,390110
 
 Build:39.0.2,390200
     commit=FENNEC_39_0_2_RELEASE
-    srclibs=MozLocales@06bd272337dc1ffe7255982e4f7643b6bfcfd774
-    output=fdroid/fennec-unsigned.apk
-    init=\
-        find toolkit/crashreporter/ -mindepth 1 -maxdepth 1 ! -name "crashreporter.mozbuild" ! -name "google-breakpad" -exec rm -R '{}' \; && \
+    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 '{}' \; && \
         rm -R toolkit/crashreporter/google-breakpad/src/tools/ && \
         rm -R toolkit/crashreporter/google-breakpad/src/client/ && \
@@ -1711,7 +1693,8 @@ Build:39.0.2,390200
         sed -i -e '/MOCHITEST/,+5d' toolkit/devtools/apps/moz.build && \
         sed -i -e '/tests\//d' toolkit/modules/moz.build && \
         sed -i -e '/tests/d' toolkit/mozapps/update/moz.build
-    scanignore=mobile/android/base/JavaAddonManager.java
+    output=fdroid/fennec-unsigned.apk
+    srclibs=MozLocales@06bd272337dc1ffe7255982e4f7643b6bfcfd774
     prebuild=mkdir fdroid && \
         fxarch=arm-linux-androideabi && \
         l10ndir=`readlink -f $$MozLocales$$` && \
@@ -1752,10 +1735,11 @@ Build:39.0.2,390200
         echo "==HEALTHREPORTER==" && \
         sed -i -e '/datareporting.healthreport.uploadEnabled/s/true/false/g' -e '/datareporting.healthreport.service.enabled/s/true/false/g' ./services/healthreport/healthreport-prefs.js && \
         sed -i -e '/android.not_a_preference.healthreport.uploadEnabled/,+3s/android:defaultValue="true"/android:defaultValue="false"/g' mobile/android/base/resources/xml/preferences_vendor.xml
+    scanignore=mobile/android/base/JavaAddonManager.java
     build=./mach build && \
         fxarch=`grep "ac_add_options --target=" .mozconfig | cut -d '=' -f2` && \
         pushd obj-${fxarch}/mobile/android/locales && \
-          for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
+        for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
         popd && \
         ./mach package && \
         mv obj-${fxarch}/dist/fennec-*.apk fdroid/fennec-unsigned.apk && \
@@ -1763,10 +1747,7 @@ Build:39.0.2,390200
 
 Build:39.0.2,390210
     commit=FENNEC_39_0_2_RELEASE
-    srclibs=MozLocales@06bd272337dc1ffe7255982e4f7643b6bfcfd774
-    output=fdroid/fennec-unsigned.apk
-    init=\
-        find toolkit/crashreporter/ -mindepth 1 -maxdepth 1 ! -name "crashreporter.mozbuild" ! -name "google-breakpad" -exec rm -R '{}' \; && \
+    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 '{}' \; && \
         rm -R toolkit/crashreporter/google-breakpad/src/tools/ && \
         rm -R toolkit/crashreporter/google-breakpad/src/client/ && \
@@ -1834,7 +1815,8 @@ Build:39.0.2,390210
         sed -i -e '/MOCHITEST/,+5d' toolkit/devtools/apps/moz.build && \
         sed -i -e '/tests\//d' toolkit/modules/moz.build && \
         sed -i -e '/tests/d' toolkit/mozapps/update/moz.build
-    scanignore=mobile/android/base/JavaAddonManager.java
+    output=fdroid/fennec-unsigned.apk
+    srclibs=MozLocales@06bd272337dc1ffe7255982e4f7643b6bfcfd774
     prebuild=mkdir fdroid && \
         fxarch=i386-linux-androideabi && \
         l10ndir=`readlink -f $$MozLocales$$` && \
@@ -1875,21 +1857,68 @@ Build:39.0.2,390210
         echo "==HEALTHREPORTER==" && \
         sed -i -e '/datareporting.healthreport.uploadEnabled/s/true/false/g' -e '/datareporting.healthreport.service.enabled/s/true/false/g' ./services/healthreport/healthreport-prefs.js && \
         sed -i -e '/android.not_a_preference.healthreport.uploadEnabled/,+3s/android:defaultValue="true"/android:defaultValue="false"/g' mobile/android/base/resources/xml/preferences_vendor.xml
+    scanignore=mobile/android/base/JavaAddonManager.java
     build=./mach build && \
         fxarch=`grep "ac_add_options --target=" .mozconfig | cut -d '=' -f2` && \
         pushd obj-${fxarch}/mobile/android/locales && \
-          for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
+        for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
         popd && \
         ./mach package && \
         mv obj-${fxarch}/dist/fennec-*.apk fdroid/fennec-unsigned.apk && \
         zip -d fdroid/fennec-unsigned.apk "META-INF*"
 
+#makes scanner explode on my local box, so only tested with --skip-scan
 Build:40.0,400000
-    disable=wip
     commit=FENNEC_40_0_RELEASE
-    srclibs=MozLocales@f4abaa2ece7fb6c56cb75222c9df7355010ff661
-    output=fdroid/fennec-unsigned.apk
-    init=\
+    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 '{}' \; && \
+        rm -R toolkit/crashreporter/google-breakpad/src/tools/ && \
+        rm -R toolkit/crashreporter/google-breakpad/src/client/ && \
+        rm -R toolkit/crashreporter/google-breakpad/src/processor/testdata/ && \
+        rm -R toolkit/crashreporter/google-breakpad/src/third_party/linux/ && \
+        find dom/html/test/ -type f -exec rm '{}' \; && \
+        rm -R accessible/tests/ && \
+        rm -R addon-sdk/source/test/ && \
+        rm -R browser/devtools/debugger/test/ && \
+        rm -R browser/devtools/webide/test/ && \
+        rm -R build/mobile/robocop/ && \
+        rm -R build/mobile/sutagent/ && \
+        rm -R chrome/test/ && \
+        rm -R content/ && \
+        rm -R docshell/test/ && \
+        rm -R dom/apps/tests/ && \
+        rm -R dom/base/crashtests/ && \
+        rm -R dom/base/test/ && \
+        rm -R dom/html/test/ && \
+        rm -R dom/indexedDB/test/ && \
+        rm -R dom/tests/ && \
+        rm -R layout/base/crashtests/ && \
+        rm -R layout/generic/crashtests/ && \
+        rm -R layout/generic/test/ && \
+        rm -R layout/reftests/ && \
+        rm -R mobile/android/build/classycle/ && \
+        rm -R mobile/android/tests/ && \
+        rm -R modules/libmar/tests/ && \
+        rm -R modules/libjar/test/ && \
+        rm -R modules/libjar/zipwriter/test/ && \
+        rm -R mozglue/linker/tests/ && \
+        rm -R security/manager/ssl/tests/compiled/ && \
+        rm -R security/manager/ssl/tests/*test/ && \
+        rm -R security/nss/cmd/bltest/tests/ && \
+        rm -R security/nss/tests/ && \
+        rm -R services/sync/tests/ && \
+        rm -R testing/crashtest/ && \
+        rm -R testing/mozbase/mozinstall/tests/ && \
+        rm -R testing/mozbase/mozprofile/tests/ && \
+        rm -R testing/web-platform/ && \
+        rm -R toolkit/devtools/apps/tests/ && \
+        rm -R toolkit/components/search/tests/ && \
+        rm -R toolkit/modules/tests/ && \
+        rm -R toolkit/mozapps/extensions/test/ && \
+        rm -R toolkit/mozapps/update/tests/ && \
+        rm -R toolkit/webapps/tests/ && \
+        rm -R widget/crashtests/ && \
+        rm -R xpcom/tests/ && \
         sed -i -e '/nsExceptionHandler/d' ipc/glue/GeckoChildProcessHost.cpp && \
         sed -i -e '/nsExceptionHandler/d' toolkit/xre/nsAndroidStartup.cpp && \
         sed -i -e '/nsExceptionHandler/d' toolkit/xre/nsEmbedFunctions.cpp && \
@@ -1909,12 +1938,15 @@ Build:40.0,400000
         sed -i -e '/MOCHITEST/,+5d' toolkit/devtools/apps/moz.build && \
         sed -i -e '/tests\//d' toolkit/modules/moz.build && \
         sed -i -e '/tests/d' toolkit/mozapps/update/moz.build
-    scanignore=mobile/android/base/JavaAddonManager.java
+    output=fdroid/fennec-unsigned.apk
+    srclibs=MozLocales@f4abaa2ece7fb6c56cb75222c9df7355010ff661
     prebuild=mkdir fdroid && \
         fxarch=arm-linux-androideabi && \
         l10ndir=`readlink -f $$MozLocales$$` && \
         sed -i -e 's|about:feedback|https://gitlab.com/fdroid/fdroiddata/issues|g' mobile/android/base/resources/xml/preferences_vendor.xml && \
         sed -i -e 's/android:debuggable="true"//g' mobile/android/base/AndroidManifest.xml.in && \
+        sed -i -e '/MOZ_SERVICES_HEALTHREPORT/d' -e '/MOZ_DEVICES/d' -e '/MOZ_SAFE_BROWSING/d' -e '/MOZ_ANDROID_RESOURCE_CONSTRAINED/,+2d' mobile/android/confvars.sh && \
+        echo -e 'MOZ_DEVICES=\nMOZ_NATIVE_DEVICES=\nMOZ_SERVICES_HEALTHREPORT=\nMOZ_SAFE_BROWSING=\n' >> mobile/android/confvars.sh && \
         sed -i -e '/MOZ_ANDROID_GOOGLE_PLAY_SERVICES/d' configure.in && \
         echo "ac_add_options --with-android-ndk=\"$$NDK$$\"" > .mozconfig && \
         echo "ac_add_options --with-android-sdk=\"$$SDK$$/platforms/android-22\"" >> .mozconfig && \
@@ -1936,8 +1968,6 @@ Build:40.0,400000
         echo 'ANDROID_PACKAGE_NAME=org.mozilla.fennec_fdroid' >> configure.sh && \
         echo 'MOZ_APP_DISPLAYNAME="Fennec F-Droid"' >> configure.sh && \
         popd && \
-        sed -i -e '/MOZ_SERVICES_HEALTHREPORTER/d' -e '/MOZ_DEVICES/d' -e '/MOZ_ANDROID_RESOURCE_CONSTRAINED/,+2d' mobile/android/confvars.sh && \
-        echo -e 'MOZ_DEVICES=\nMOZ_NATIVE_DEVICES=\nMOZ_ANDROID_GOOGLE_PLAY_SERVICES=\nMOZ_SERVICES_HEALTHREPORTER=\n' >> mobile/android/confvars.sh && \
         sed -i -e 's/size_impl(v/size_impl(const v/g' memory/mozjemalloc/jemalloc.c && \
         rm -R mobile/android/gradle/ && \
         sed -i -e '/gradle/d' mobile/android/moz.build && \
@@ -1947,25 +1977,29 @@ Build:40.0,400000
         echo 'pref("media.gmp-gmpopenh264.enabled", false);' >> mobile/android/app/mobile.js && \
         sed -i -e '/casting.enabled/d' mobile/android/app/mobile.js && \
         echo 'pref("browser.casting.enabled", false);' >> mobile/android/app/mobile.js && \
+        mkdir -p layout/reftests/ && \
+        touch layout/reftests/moz.build && \
         echo "==HEALTHREPORTER==" && \
         sed -i -e '/datareporting.healthreport.uploadEnabled/s/true/false/g' -e '/datareporting.healthreport.service.enabled/s/true/false/g' ./services/healthreport/healthreport-prefs.js && \
-        sed -i -e '/android.not_a_preference.healthreport.uploadEnabled/,+3s/android:defaultValue="true"/android:defaultValue="false"/g' mobile/android/base/resources/xml/preferences_vendor.xml
+        sed -i -e '/android.not_a_preference.healthreport.uploadEnabled/,+3s/android:defaultValue="true"/android:defaultValue="false"/g' mobile/android/base/resources/xml/preferences_vendor.xml && \
+        rm mobile/android/base/health/* && \
+        rm -R mobile/android/base/background/*report* && \
+        rm mobile/android/services/manifests/HealthReport* && \
+        patch -p1 <$$MozLocales$$/Remove_FHR.patch
+    scanignore=mobile/android/base/JavaAddonManager.java
     build=./mach build && \
         fxarch=`grep "ac_add_options --target=" .mozconfig | cut -d '=' -f2` && \
         pushd obj-${fxarch}/mobile/android/locales && \
-          for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
+        for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
         popd && \
         ./mach package && \
         mv obj-${fxarch}/dist/fennec-*.apk fdroid/fennec-unsigned.apk && \
         zip -d fdroid/fennec-unsigned.apk "META-INF*"
 
+#makes scanner explode on my local box, so only tested with --skip-scan
 Build:40.0,400010
-    disable=wait
     commit=FENNEC_40_0_RELEASE
-    srclibs=MozLocales@f4abaa2ece7fb6c56cb75222c9df7355010ff661
-    output=fdroid/fennec-unsigned.apk
-    init=\
-        find toolkit/crashreporter/ -mindepth 1 -maxdepth 1 ! -name "crashreporter.mozbuild" ! -name "google-breakpad" -exec rm -R '{}' \; && \
+    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 '{}' \; && \
         rm -R toolkit/crashreporter/google-breakpad/src/tools/ && \
         rm -R toolkit/crashreporter/google-breakpad/src/client/ && \
@@ -1991,8 +2025,8 @@ Build:40.0,400010
         rm -R layout/generic/crashtests/ && \
         rm -R layout/generic/test/ && \
         rm -R layout/reftests/ && \
-        rm -R mobile/android/base/tests/ && \
         rm -R mobile/android/build/classycle/ && \
+        rm -R mobile/android/tests/ && \
         rm -R modules/libmar/tests/ && \
         rm -R modules/libjar/test/ && \
         rm -R modules/libjar/zipwriter/test/ && \
@@ -2033,12 +2067,15 @@ Build:40.0,400010
         sed -i -e '/MOCHITEST/,+5d' toolkit/devtools/apps/moz.build && \
         sed -i -e '/tests\//d' toolkit/modules/moz.build && \
         sed -i -e '/tests/d' toolkit/mozapps/update/moz.build
-    scanignore=mobile/android/base/JavaAddonManager.java
+    output=fdroid/fennec-unsigned.apk
+    srclibs=MozLocales@f4abaa2ece7fb6c56cb75222c9df7355010ff661
     prebuild=mkdir fdroid && \
         fxarch=i386-linux-androideabi && \
         l10ndir=`readlink -f $$MozLocales$$` && \
         sed -i -e 's|about:feedback|https://gitlab.com/fdroid/fdroiddata/issues|g' mobile/android/base/resources/xml/preferences_vendor.xml && \
         sed -i -e 's/android:debuggable="true"//g' mobile/android/base/AndroidManifest.xml.in && \
+        sed -i -e '/MOZ_SERVICES_HEALTHREPORT/d' -e '/MOZ_DEVICES/d' -e '/MOZ_SAFE_BROWSING/d' -e '/MOZ_ANDROID_RESOURCE_CONSTRAINED/,+2d' mobile/android/confvars.sh && \
+        echo -e 'MOZ_DEVICES=\nMOZ_NATIVE_DEVICES=\nMOZ_SERVICES_HEALTHREPORT=\nMOZ_SAFE_BROWSING=\n' >> mobile/android/confvars.sh && \
         sed -i -e '/MOZ_ANDROID_GOOGLE_PLAY_SERVICES/d' configure.in && \
         echo "ac_add_options --with-android-ndk=\"$$NDK$$\"" > .mozconfig && \
         echo "ac_add_options --with-android-sdk=\"$$SDK$$/platforms/android-22\"" >> .mozconfig && \
@@ -2060,8 +2097,6 @@ Build:40.0,400010
         echo 'ANDROID_PACKAGE_NAME=org.mozilla.fennec_fdroid' >> configure.sh && \
         echo 'MOZ_APP_DISPLAYNAME="Fennec F-Droid"' >> configure.sh && \
         popd && \
-        sed -i -e '/MOZ_SERVICES_HEALTHREPORTER/d' -e '/MOZ_DEVICES/d' -e '/MOZ_ANDROID_RESOURCE_CONSTRAINED/,+2d' mobile/android/confvars.sh && \
-        echo -e 'MOZ_DEVICES=\nMOZ_NATIVE_DEVICES=\nMOZ_ANDROID_GOOGLE_PLAY_SERVICES=\nMOZ_SERVICES_HEALTHREPORTER=\n' >> mobile/android/confvars.sh && \
         sed -i -e 's/size_impl(v/size_impl(const v/g' memory/mozjemalloc/jemalloc.c && \
         rm -R mobile/android/gradle/ && \
         sed -i -e '/gradle/d' mobile/android/moz.build && \
@@ -2071,13 +2106,20 @@ Build:40.0,400010
         echo 'pref("media.gmp-gmpopenh264.enabled", false);' >> mobile/android/app/mobile.js && \
         sed -i -e '/casting.enabled/d' mobile/android/app/mobile.js && \
         echo 'pref("browser.casting.enabled", false);' >> mobile/android/app/mobile.js && \
+        mkdir -p layout/reftests/ && \
+        touch layout/reftests/moz.build && \
         echo "==HEALTHREPORTER==" && \
         sed -i -e '/datareporting.healthreport.uploadEnabled/s/true/false/g' -e '/datareporting.healthreport.service.enabled/s/true/false/g' ./services/healthreport/healthreport-prefs.js && \
-        sed -i -e '/android.not_a_preference.healthreport.uploadEnabled/,+3s/android:defaultValue="true"/android:defaultValue="false"/g' mobile/android/base/resources/xml/preferences_vendor.xml
+        sed -i -e '/android.not_a_preference.healthreport.uploadEnabled/,+3s/android:defaultValue="true"/android:defaultValue="false"/g' mobile/android/base/resources/xml/preferences_vendor.xml && \
+        rm mobile/android/base/health/* && \
+        rm -R mobile/android/base/background/*report* && \
+        rm mobile/android/services/manifests/HealthReport* && \
+        patch -p1 <$$MozLocales$$/Remove_FHR.patch
+    scanignore=mobile/android/base/JavaAddonManager.java
     build=./mach build && \
         fxarch=`grep "ac_add_options --target=" .mozconfig | cut -d '=' -f2` && \
         pushd obj-${fxarch}/mobile/android/locales && \
-          for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
+        for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \
         popd && \
         ./mach package && \
         mv obj-${fxarch}/dist/fennec-*.apk fdroid/fennec-unsigned.apk && \
@@ -2124,3 +2166,4 @@ Auto Update Mode:None
 Update Check Mode:None
 Current Version:39.0.2
 Current Version Code:390210
+