diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py
index fda8768..6ae24fa 100755
--- a/tools/clang/scripts/update.py
+++ b/tools/clang/scripts/update.py
@@ -27,7 +27,7 @@
 # Do NOT CHANGE this if you don't know what you're doing -- see
 # https://chromium.googlesource.com/chromium/src/+/master/docs/updating_clang.md
 # Reverting problematic clang rolls is safe, though.
-CLANG_REVISION = '337439'
+CLANG_REVISION = '338452'
 
 use_head_revision = bool(os.environ.get('LLVM_FORCE_HEAD_REVISION', '0')
                          in ('1', 'YES'))
@@ -828,9 +828,11 @@
       RunCommand(['ninja', 'asan', 'ubsan', 'profile'])
 
       # And copy them into the main build tree.
+      want_archs = '{aarch64,arm}'
       want = [
-          'lib/linux/*.so',  # ASan and UBSan shared libraries only.
-          'lib/linux/*profile*',  # Static profile libraries.
+          'lib/linux/libclang_rt.asan-%s-android.so' % want_archs,
+          'lib/linux/libclang_rt.ubsan_standalone-%s-android.so' % want_archs,
+          'lib/linux/libclang_rt.profile-%s-android.a' % want_archs,
       ]
       for p in want:
         for f in glob.glob(os.path.join(build_dir, p)):
@@ -903,6 +905,11 @@
       args.force_local_build):
     AddSvnToPathOnWin()
 
+  if use_head_revision:
+    # TODO(hans): Trunk version was updated; remove after the next roll.
+    global VERSION
+    VERSION = '8.0.0'
+
   if args.verify_version and args.verify_version != VERSION:
     print 'VERSION is %s but --verify-version argument was %s, exiting.' % (
         VERSION, args.verify_version)