Bump tor-browser-build to tbb-9.0a7-build1

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-x86_64: submodule-update
+	$(rbm) build ncdns --target release --target ncdns-android-x86_64
+
 release-android-aarch64: submodule-update
 	$(rbm) build ncdns --target release --target ncdns-android-aarch64
 

rbm.conf

@@ -127,6 +127,14 @@ targets:
     var:
       android-x86: 1
       osname: android-x86
+  ncdns-android-x86_64:
+    - android-x86_64
+    - android
+  android-x86_64:
+    arch: x86_64
+    var:
+      android-x86_64: 1
+      osname: android-x86_64
   ncdns-android-aarch64:
     - android-aarch64
     - android
@@ -145,6 +153,7 @@ targets:
       android_min_api_aarch64: 21
       android_min_api_armv7: 16
       android_min_api_x86: 16
+      android_min_api_x86_64: 21
       container:
         suite: stretch
         arch: amd64
@@ -205,9 +214,6 @@ targets:
     var:
       windows-x86_64: 1
       osname: windows-x86_64
-      container:
-        arch: amd64
-      faketime_path: /usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1
       # HEASLR is 64 bit only (see bug 12968)
       flag_HEASLR: '-Wl,--high-entropy-va'
   windows-i686:
@@ -215,25 +221,18 @@ targets:
     var:
       windows-i686: 1
       osname: windows-i686
-      container:
-        arch: i386
-      faketime_path: /usr/lib/i386-linux-gnu/faketime/libfaketime.so.1
-      setarch: |
-        if test -z "$RBM_SETARCH"
-        then
-           export RBM_SETARCH=1
-           exec setarch i686 ./build
-        fi
   windows:
     var:
       windows: 1
       container:
         suite: stretch
+        arch: amd64
       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") %]'
       flag_mwindows: '-mwindows'
       compiler: mingw-w64
+      faketime_path: /usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1
       deps:
         - build-essential
         - python

tor-browser-build

@@ -1 +1 @@
-Subproject commit 9fde9fe3b38b8785d08ea0d1fc291ac0c266ed04
+Subproject commit 9d253167005def507583f90f01f0fc96e2bdbe07