diff --git a/DEPS b/DEPS
index 41567cde3e3..0d17f830895 100644
--- a/DEPS
+++ b/DEPS
@@ -109,7 +109,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + '64d07cbd3d9fa0c15f06c8e24c3bdbf5a9a06329',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + '24bd842dde44696462562fb02f9e2226f9297d92',
 
    # Fuchsia compatibility
    #
diff --git a/engine/src/flutter/shell/platform/windows/window_proc_delegate_manager_unittests.cc b/engine/src/flutter/shell/platform/windows/window_proc_delegate_manager_unittests.cc
index 9177638c621..195fb5b88cd 100644
--- a/engine/src/flutter/shell/platform/windows/window_proc_delegate_manager_unittests.cc
+++ b/engine/src/flutter/shell/platform/windows/window_proc_delegate_manager_unittests.cc
@@ -10,11 +10,18 @@ namespace testing {
 
 namespace {
 
+#ifdef _WIN32
+#define FLUTTER_NOINLINE __declspec(noinline)
+#else
+#define FLUTTER_NOINLINE __attribute__((noinline))
+#endif
+
 using TestWindowProcDelegate = std::function<std::optional<
     LRESULT>(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam)>;
 
 // A FlutterDesktopWindowProcCallback that forwards to a std::function provided
 // as user_data.
+FLUTTER_NOINLINE
 bool TestWindowProcCallback(HWND hwnd,
                             UINT message,
                             WPARAM wparam,
diff --git a/engine/src/flutter/tools/dia_dll.py b/engine/src/flutter/tools/dia_dll.py
index 8d367ca6916..4c0d45f2c49 100644
--- a/engine/src/flutter/tools/dia_dll.py
+++ b/engine/src/flutter/tools/dia_dll.py
@@ -44,7 +44,7 @@ def GetDiaDll():
   msvs_version = vs_toolchain.GetVisualStudioVersion()
 
   if bool(int(os.environ.get('DEPOT_TOOLS_WIN_TOOLCHAIN', '1'))):
-    dia_path = os.path.join(win_sdk_dir, '..', 'DIA SDK', 'bin', 'amd64')
+    dia_path = os.path.join(win_sdk_dir, '..', '..', 'DIA SDK', 'bin', 'amd64')
   else:
     if 'GYP_MSVS_OVERRIDE_PATH' in os.environ:
       vs_path = os.environ['GYP_MSVS_OVERRIDE_PATH']