diff --git a/DEPS b/DEPS
index 6156dbfb5b9181e4b5ec0a59777196a15cc37e94..fbd998cb8c1a60eae0ac37c31613ef69caca1c18 100644
--- a/DEPS
+++ b/DEPS
@@ -114,7 +114,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + '77c6728e5ac9fc7d08b163ed5bf8bc64fc463f21',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + '5eb993a6018110a47486b211b30a4369bca4b722',
 
    # Fuchsia compatibility
    #
diff --git a/lib/snapshot/BUILD.gn b/lib/snapshot/BUILD.gn
index 6e808086c2323b30e7807f4326972c2cf7653103..446da6e3b837d80315db83e5689b7ae2564d8751 100644
--- a/lib/snapshot/BUILD.gn
+++ b/lib/snapshot/BUILD.gn
@@ -91,7 +91,7 @@ action("generate_snapshot_bin") {
 
   deps = [
     ":generate_dart_ui",
-    "//third_party/dart/runtime/bin:gen_snapshot($dart_host_toolchain)",
+    "//third_party/dart/runtime/bin:gen_snapshot($host_toolchain)",
   ]
   depfile = "$target_gen_dir/core_snapshot.d"
 
@@ -119,7 +119,7 @@ action("generate_snapshot_bin") {
   rebased_dart_ui_path = rebase_path(dart_ui_path)
 
   gen_snapshot_dir =
-      get_label_info("//third_party/dart/runtime/bin:gen_snapshot($dart_host_toolchain)",
+      get_label_info("//third_party/dart/runtime/bin:gen_snapshot($host_toolchain)",
                      "root_out_dir")
   script = "//third_party/dart/runtime/tools/create_snapshot_bin.py"
 
diff --git a/tools/gn b/tools/gn
index fded2b0c25d869cbd2a0de03d1aedccb4ecc8752..d05f218fd1f0a00dcab64a994973e93c35c3645b 100755
--- a/tools/gn
+++ b/tools/gn
@@ -132,22 +132,12 @@ def to_gn_args(args):
       if 'target_cpu' in gn_args:
         gn_args['target_cpu'] = cpu_for_target_arch(gn_args['target_cpu'])
 
-    # Modify host_toolchain into dart_host_toolchain so it matches word size of target_cpu
+    # Make sure the host toolchain has the same bit width as the target
+    # toolchain. This ensures that Dart's gen_snapshot generates the right
+    # code for the target.
     target_is_32_bit = gn_args['target_cpu'] == 'arm' or gn_args['target_cpu'] == 'x86'
     if target_is_32_bit:
-      if sys.platform.startswith('linux'):
-        gn_args['dart_host_toolchain'] = "//build/toolchain/linux:clang_x86"
-      elif sys.platform.startswith('darwin'):
-        gn_args['dart_host_toolchain'] = "//build/toolchain/mac:clang_i386"
-      elif sys.platform.startswith('win'):
-        gn_args['dart_host_toolchain'] = "//build/toolchain/win:x86"
-    else:
-      if sys.platform.startswith('linux'):
-        gn_args['dart_host_toolchain'] = "//build/toolchain/linux:clang_x64"
-      elif sys.platform.startswith('darwin'):
-        gn_args['dart_host_toolchain'] = "//build/toolchain/mac:clang_x64"
-      elif sys.platform.startswith('win'):
-        gn_args['dart_host_toolchain'] = "//build/toolchain/win:x64"
+      gn_args['host_cpu'] = 'x86';
 
     gn_args['flutter_runtime_mode'] = args.runtime_mode
     gn_args['flutter_aot'] = aot