diff --git a/rbm.conf b/rbm.conf
index 474b38a..753a73a 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -119,6 +119,7 @@ targets:
     var:
       android-armv7: 1
       osname: android-armv7
+      toolchain_arch: arm
   ncdns-android-x86:
     - android-x86
     - android
@@ -127,6 +128,7 @@ targets:
     var:
       android-x86: 1
       osname: android-x86
+      toolchain_arch: x86
   ncdns-android-x86_64:
     - android-x86_64
     - android
@@ -135,6 +137,7 @@ targets:
     var:
       android-x86_64: 1
       osname: android-x86_64
+      toolchain_arch: x86_64
   ncdns-android-aarch64:
     - android-aarch64
     - android
@@ -143,6 +146,7 @@ targets:
     var:
       android-aarch64: 1
       osname: android-aarch64
+      toolchain_arch: arm64
   android:
     var:
       android: 1
@@ -154,6 +158,8 @@ targets:
       android_min_api_armv7: 16
       android_min_api_x86: 16
       android_min_api_x86_64: 21
+      CC: '$ANDROID_NDK_HOME/[% c("var/toolchain_arch") %]/bin/clang'
+      CXX: '$ANDROID_NDK_HOME/[% c("var/toolchain_arch") %]/bin/clang++'
       container:
         suite: stretch
         arch: amd64
diff --git a/tor-browser-build b/tor-browser-build
index eab4178..95bc7fd 160000
--- a/tor-browser-build
+++ b/tor-browser-build
@@ -1 +1 @@
-Subproject commit eab41780abd544091ebb532b128c6d6d07087a70
+Subproject commit 95bc7fde8230aab8fdb3cc87a1d8143f400c25e4