Bump tor-browser-build to tbb-9.0a6-build4

Also update Makefile and rbm.conf to sync with upstream changes

Makefile

@@ -12,6 +12,9 @@ release-android-armv7: submodule-update
 release-android-x86: submodule-update
 	$(rbm) build ncdns --target release --target ncdns-android-x86
 
+release-android-aarch64: submodule-update
+	$(rbm) build ncdns --target release --target ncdns-android-aarch64
+
 release-linux-x86_64: submodule-update
 	$(rbm) build certdehydrate-dane-rest-api --target release --target ncdns-linux-x86_64
 	$(rbm) build dnssec-hsts --target release --target ncdns-linux-x86_64

rbm.conf

@@ -106,7 +106,6 @@ targets:
       deps:
         - build-essential
         - python
-        - bison
         - automake
         - libtool
         - zip
@@ -128,19 +127,30 @@ targets:
     var:
       android-x86: 1
       osname: android-x86
+  ncdns-android-aarch64:
+    - android-aarch64
+    - android
+  android-aarch64:
+    arch: aarch64
+    var:
+      android-aarch64: 1
+      osname: android-aarch64
   android:
     var:
       android: 1
       compiler: android-toolchain
       # API 16 is the minimum we currently support for Tor Browser on Android
-      android_min_api: 16
+      android_min_api: '[% GET c("var/android_min_api_" _ c("arch")) %]'
+      # API 21 is the minimum we currently support for arm64 on Android
+      android_min_api_aarch64: 21
+      android_min_api_armv7: 16
+      android_min_api_x86: 16
       container:
         suite: stretch
         arch: amd64
       deps:
         - build-essential
         - python
-        - bison
         - automake
         - libtool
         - zip
@@ -218,7 +228,7 @@ targets:
     var:
       windows: 1
       container:
-        suite: jessie
+        suite: stretch
       configure_opt: '--host=[% c("arch") %]-w64-mingw32 CFLAGS="[% c("var/CFLAGS") %]" LDFLAGS="[% c("var/LDFLAGS") %]"'
       CFLAGS: '-fstack-protector-strong -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security [% c("var/flag_mwindows") %]'
       LDFLAGS: '-Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs [% c("var/flag_HEASLR") %] [% c("var/flag_mwindows") %]'
@@ -241,16 +251,16 @@ targets:
       osx: 1
       osname: osx-x86_64
       container:
-        suite: jessie
+        suite: stretch
         arch: amd64
       compiler: 'macosx-toolchain'
       configure_opt: '--host=x86_64-apple-darwin11 CC="x86_64-apple-darwin11-clang [% c("var/FLAGS") %]" CXX="x86_64-apple-darwin11-clang++ [% c("var/FLAGS") %]"'
       FLAGS: "-target x86_64-apple-darwin11 -B $cctoolsdir -isysroot $sysrootdir"
       LDFLAGS: "-Wl,-syslibroot,$sysrootdir -Wl,-dead_strip -Wl,-pie"
+      macosx_deployment_target: '10.9'
       deps:
         - build-essential
         - python
-        - bison
         - automake
         - libtool
         - zip

tor-browser-build

@@ -1 +1 @@
-Subproject commit 0fc15a39f2adcf029676810c2ec37c566886879e
+Subproject commit 9fde9fe3b38b8785d08ea0d1fc291ac0c266ed04