diff --git a/DEPS b/DEPS
index 58379581c38..e357f07a368 100644
--- a/DEPS
+++ b/DEPS
@@ -124,7 +124,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + '9d22a70a56c948476256c4a7f3ad26ad32e4a548',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + '3c8e427128687be69576d68886d7e555bbd89253',
 
    # Fuchsia compatibility
    #
diff --git a/engine/src/flutter/tools/gn b/engine/src/flutter/tools/gn
index 0a6b29fddec..40febb651b3 100755
--- a/engine/src/flutter/tools/gn
+++ b/engine/src/flutter/tools/gn
@@ -384,7 +384,11 @@ def main(argv):
       'asm',
     ]
 
-    contents = subprocess.check_output(compile_cmd_gen_cmd, cwd=SRC_ROOT)
+    try:
+      contents = subprocess.check_output(compile_cmd_gen_cmd, cwd=SRC_ROOT)
+    except subprocess.CalledProcessError as exc:
+      print "Failed to run ninja: ", exc.returncode, exc.output
+      sys.exit(1)
     compile_commands = open('%s/out/compile_commands.json' % SRC_ROOT, 'w+')
     compile_commands.write(contents)
     compile_commands.close()