diff --git a/DEPS b/DEPS
index b9715c8cbe61f5e3aa0056b55974d46cc5a92a59..56360501f093022a2555cd9b05be69352b683649 100644
--- a/DEPS
+++ b/DEPS
@@ -45,7 +45,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + 'fb02c1530237201ab1202962cb3a26b233d01262',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + 'a938377f3f705a75c9054ed851677e33750eb0ee',
 
    # Fuchsia compatibility
    #
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index 345a824c89a225b790564f9b0887a712615d150b..9a3f9ff80b8f7b7f92021a0a748d8f24d373b95d 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -342,7 +342,7 @@ component("skia") {
     "//third_party/skia/src/fonts/SkGScalerContext.h",
   ]
 
-  if (is_ios || is_mac || is_android || use_glfw) {
+  if (is_ios || is_mac || is_android) {
     sources -= [
       "//third_party/skia/src/gpu/gl/GrGLCreateNativeInterface_none.cpp"
     ]
@@ -361,10 +361,6 @@ component("skia") {
       sources += [
         "//third_party/skia/src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp"
       ]
-    } else if (use_glfw) {
-      sources += [
-        "//third_party/skia/src/gpu/gl/glfw/GrGLCreateNativeInterface_glfw.cpp"
-      ]
     }
 
     set_sources_assignment_filter(sources_assignment_filter)
diff --git a/sky/engine/platform/BUILD.gn b/sky/engine/platform/BUILD.gn
index 48486eca4eccf88f7735bee812c43cc8658ff220..9c602ff701133e77fbaba39688c6bfe8e2757daf 100644
--- a/sky/engine/platform/BUILD.gn
+++ b/sky/engine/platform/BUILD.gn
@@ -317,8 +317,4 @@ source_set("platform") {
     ]
     set_sources_assignment_filter(sources_assignment_filter)
   }
-
-  if (is_linux) {
-    direct_dependent_configs = [ "//build/config/linux:fontconfig" ]
-  }
 }