diff --git a/util/bot/DEPS b/util/bot/DEPS
index 7b9f39e..a4c3a7f 100644
--- a/util/bot/DEPS
+++ b/util/bot/DEPS
@@ -22,7 +22,7 @@
 
 deps = {
   'boringssl/util/bot/android_tools': {
-    'url': Var('chromium_git') + '/android_tools.git' + '@' + 'ca0bd083872ad925881736fe2bedc3ff855e08f5',
+    'url': Var('chromium_git') + '/android_tools.git' + '@' + 'a2e9bc7c1b41d983577907df51d339fb1e0fd02f',
     'condition': 'checkout_android',
   },
 
@@ -30,7 +30,7 @@
     Var('chromium_git') + '/external/gyp.git' + '@' + 'd61a9397e668fa9843c4aa7da9e79460fe590bfb',
 
   'boringssl/util/bot/libFuzzer': {
-    'url': Var('chromium_git') + '/chromium/llvm-project/compiler-rt/lib/fuzzer.git' + '@' + '06fb50cc1f0197398c8a70658928a3b91912e68a',
+    'url': Var('chromium_git') + '/chromium/llvm-project/compiler-rt/lib/fuzzer.git' + '@' + 'a00e8070bea627f21df4a7eb1d58083f1bcfbba1',
     'condition': 'checkout_fuzzer',
   },
 }
diff --git a/util/bot/update_clang.py b/util/bot/update_clang.py
index ee66153..ffe7880 100644
--- a/util/bot/update_clang.py
+++ b/util/bot/update_clang.py
@@ -19,8 +19,8 @@
 # CLANG_REVISION and CLANG_SUB_REVISION determine the build of clang
 # to use. These should be synced with tools/clang/scripts/update.py in
 # Chromium.
-CLANG_REVISION = '315613'
-CLANG_SUB_REVISION=2
+CLANG_REVISION = '318667'
+CLANG_SUB_REVISION=1
 
 PACKAGE_VERSION = "%s-%s" % (CLANG_REVISION, CLANG_SUB_REVISION)
 
diff --git a/util/bot/vs_toolchain.py b/util/bot/vs_toolchain.py
index 153a6ed..64da79a 100644
--- a/util/bot/vs_toolchain.py
+++ b/util/bot/vs_toolchain.py
@@ -87,8 +87,8 @@
     # Update 3 final with 10.0.15063.468 SDK and no vctip.exe.
     return ['f53e4598951162bad6330f7a167486c7ae5db1e5']
   if env_version == '2017':
-    # VS 2017 Update 4 with 10.0.15063.468 SDK.
-    return ['88c3b62e1eb0893b8cd57e3f4859c3af27907f64']
+    # VS 2017 Update 3.2 with 10.0.15063.468 SDK and patched setenv.cmd.
+    return ['a9e1098bba66d2acccc377d5ee81265910f29272']
   raise Exception('Unsupported VS version %s' % env_version)