diff --git a/DEPS b/DEPS
index 6cc050877a3af..10fc7e1682918 100644
--- a/DEPS
+++ b/DEPS
@@ -102,7 +102,7 @@ vars = {
   # Build bot tooling for iOS
   'ios_tools_revision': '69b7c1b160e7107a6a98d948363772dc9caea46f',
 
-  'buildtools_revision': 'ae85410691b10aa2469695c2421b1fe751843e64',
+  'buildtools_revision': 'c1408453246f0475547b6fe634c2f3dad71c6457',
 }
 
 # Only these hosts are allowed for dependencies in this DEPS file.
@@ -115,7 +115,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + '7aadfaf196f9cd8a299f9ad78fab63362800466d',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + 'be483cb1cd3a9c4313b2e534034d23a05c3d849e',
 
    # Fuchsia compatibility
    #
diff --git a/fml/memory/ref_counted_unittest.cc b/fml/memory/ref_counted_unittest.cc
index 40b7bd095d412..5b6f68e1de6d1 100644
--- a/fml/memory/ref_counted_unittest.cc
+++ b/fml/memory/ref_counted_unittest.cc
@@ -29,6 +29,16 @@
 #define ALLOW_SELF_MOVE(code_line) code_line;
 #endif
 
+#if defined(__clang__)
+#define ALLOW_SELF_ASSIGN_OVERLOADED(code_line)                        \
+  _Pragma("clang diagnostic push")                                     \
+      _Pragma("clang diagnostic ignored \"-Wself-assign-overloaded\"") \
+          code_line;                                                   \
+  _Pragma("clang diagnostic pop")
+#else
+#define ALLOW_SELF_ASSIGN_OVERLOADED(code_line) code_line;
+#endif
+
 namespace fml {
 namespace {
 
@@ -425,7 +435,7 @@ TEST(RefCountedTest, SelfAssignment) {
     was_destroyed = false;
     RefPtr<MyClass> r(MakeRefCounted<MyClass>(&created, &was_destroyed));
     // Copy.
-    r = r;
+    ALLOW_SELF_ASSIGN_OVERLOADED(r = r);
     EXPECT_EQ(created, r.get());
     EXPECT_FALSE(was_destroyed);
   }
diff --git a/shell/platform/darwin/BUILD.gn b/shell/platform/darwin/BUILD.gn
index e608a9dd6af48..9f4dfca0714c9 100644
--- a/shell/platform/darwin/BUILD.gn
+++ b/shell/platform/darwin/BUILD.gn
@@ -28,6 +28,7 @@ source_set("flutter_channels") {
     "ios/framework/Headers/FlutterBinaryMessenger.h",
     "ios/framework/Headers/FlutterChannels.h",
     "ios/framework/Headers/FlutterCodecs.h",
+    "ios/framework/Headers/FlutterMacros.h",
     "ios/framework/Source/FlutterChannels.mm",
     "ios/framework/Source/FlutterCodecs.mm",
     "ios/framework/Source/FlutterStandardCodec.mm",
diff --git a/tools/gn b/tools/gn
index 0a15b78e2b81b..874b9e049a3b7 100755
--- a/tools/gn
+++ b/tools/gn
@@ -89,7 +89,7 @@ def to_gn_args(args):
     gn_args['is_debug'] = args.unoptimized
     gn_args['android_full_debug'] = args.target_os == 'android' and args.unoptimized
     gn_args['is_clang'] = not sys.platform.startswith(('cygwin', 'win'))
-    
+
     gn_args['embedder_for_target'] = args.embedder_for_target
 
     enable_lto = args.lto
@@ -248,9 +248,9 @@ def main(argv):
   if sys.platform.startswith(('cygwin', 'win')):
     subdir = 'win'
   elif sys.platform == 'darwin':
-    subdir = 'mac'
+    subdir = 'mac-x64'
   elif sys.platform.startswith('linux'):
-     subdir = 'linux64'
+     subdir = 'linux-x64'
   else:
     raise Error('Unknown platform: ' + sys.platform)