diff --git a/DEPS b/DEPS
index 405498f36e342..5f9df4522483f 100644
--- a/DEPS
+++ b/DEPS
@@ -98,7 +98,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + '9d2c731ba05432878cc5187329c66b70983d914b',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + '92a8d2eb7aad592068f808e39b8330fd2bce25e3',
 
    # Fuchsia compatibility
    #
@@ -500,7 +500,7 @@ deps = {
     'packages': [
       {
         'package': 'fuchsia/third_party/clang/${{platform}}',
-        'version': 'git_revision:7e9747b50bcb1be28d4a3236571e8050835497a6'
+        'version': 'git_revision:25abd1994ed209c1bf4139946a42e36a42143a85'
       }
     ],
     'condition': 'host_os == "mac" or host_os == "linux"',
diff --git a/tools/gn b/tools/gn
index 119dd067c945b..9f0fd4d2b6db6 100755
--- a/tools/gn
+++ b/tools/gn
@@ -327,6 +327,10 @@ def to_gn_args(args):
 
     gn_args['dart_version_git_info'] = not args.no_dart_version_git_info
 
+    # Overrides whether Boring SSL is compiled with system as. Only meaningful
+    # on Android.
+    gn_args['bssl_use_clang_integrated_as'] = True
+
     return gn_args
 
 def parse_args(args):