diff --git a/DEPS b/DEPS
index 9870cf52ce39a..025256078b074 100644
--- a/DEPS
+++ b/DEPS
@@ -283,7 +283,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + 'e9df434539745202fa5f9b729fe5f82e5de3f025',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + 'a22a4ea15e0b9cbba9200014f90fcea16ecb896a',
 
   'src/flutter/third_party/depot_tools':
   Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '580b4ff3f5cd0dcaa2eacda28cefe0f45320e8f7',
@@ -829,7 +829,7 @@ deps = {
     'dep_type': 'cipd',
   },
 
-  'src/buildtools/emsdk': {
+  'src/flutter/prebuilts/emsdk': {
    'url': Var('skia_git') + '/external/github.com/emscripten-core/emsdk.git' + '@' + 'a896e3d066448b3530dbcaa48869fafefd738f57',
    'condition': 'download_emsdk',
   },
@@ -1055,7 +1055,7 @@ deps = {
     'dep_type': 'cipd',
   },
 
-  'src/third_party/google_fonts_for_unit_tests': {
+  'src/flutter/third_party/google_fonts_for_unit_tests': {
       'packages': [
         {
           'package': 'flutter/flutter_font_fallbacks',
diff --git a/ci/licenses_golden/excluded_files b/ci/licenses_golden/excluded_files
index fc1766751bb8e..5e5bba465a18d 100644
--- a/ci/licenses_golden/excluded_files
+++ b/ci/licenses_golden/excluded_files
@@ -1541,6 +1541,7 @@
 ../../../flutter/third_party/glfw/src/CMakeLists.txt
 ../../../flutter/third_party/glfw/tests
 ../../../flutter/third_party/gn
+../../../flutter/third_party/google_fonts_for_unit_tests
 ../../../flutter/third_party/googletest
 ../../../flutter/third_party/gtest-parallel/.git
 ../../../flutter/third_party/gtest-parallel/.gitignore
@@ -3400,7 +3401,6 @@
 ../../../third_party/dart/utils/OWNERS
 ../../../third_party/dart/utils/compiler/.gitignore
 ../../../third_party/dart/utils/dartanalyzer/.gitignore
-../../../third_party/google_fonts_for_unit_tests
 ../../../third_party/gradle
 ../../../third_party/java
 ../../../third_party/libcxx/.clang-format
diff --git a/ci/licenses_golden/tool_signature b/ci/licenses_golden/tool_signature
index fd7c613b0e911..89511c0d45801 100644
--- a/ci/licenses_golden/tool_signature
+++ b/ci/licenses_golden/tool_signature
@@ -1,2 +1,2 @@
-Signature: 3c449c19152f3b271877be5efd19efa1
+Signature: 10ea95d73c5e8a92240f014b15634a8c
 
diff --git a/lib/web_ui/dev/roll_fallback_fonts.dart b/lib/web_ui/dev/roll_fallback_fonts.dart
index a281138009fda..5981e28d627ef 100644
--- a/lib/web_ui/dev/roll_fallback_fonts.dart
+++ b/lib/web_ui/dev/roll_fallback_fonts.dart
@@ -323,7 +323,7 @@ OTHER DEALINGS IN THE FONT SOFTWARE.
     );
     await runProcess('gclient', <String>[
       'setdep',
-      '--revision=src/third_party/google_fonts_for_unit_tests:$packageName@$versionString',
+      '--revision=src/flutter/third_party/google_fonts_for_unit_tests:$packageName@$versionString',
       '--deps-file=$depFilePath'
     ]);
   }
diff --git a/lib/web_ui/dev/steps/copy_artifacts_step.dart b/lib/web_ui/dev/steps/copy_artifacts_step.dart
index b02f6f49e4c8b..7c7293bbd5fc6 100644
--- a/lib/web_ui/dev/steps/copy_artifacts_step.dart
+++ b/lib/web_ui/dev/steps/copy_artifacts_step.dart
@@ -105,6 +105,7 @@ class CopyArtifactsStep implements PipelineStep {
 
     final io.Directory fallbackFontsSource = io.Directory(pathlib.join(
       environment.engineSrcDir.path,
+      'flutter',
       'third_party',
       'google_fonts_for_unit_tests',
     ));
diff --git a/tools/activate_emsdk.py b/tools/activate_emsdk.py
index 11d0f302dd64b..64219942a4a97 100644
--- a/tools/activate_emsdk.py
+++ b/tools/activate_emsdk.py
@@ -9,7 +9,7 @@
 import subprocess
 import sys
 
-EMSDK_ROOT = os.path.abspath(os.path.join(__file__, '..', '..', '..', 'buildtools', 'emsdk'))
+EMSDK_ROOT = os.path.abspath(os.path.join(__file__, '..', '..', 'prebuilts', 'emsdk'))
 
 EMSDK_PATH = os.path.join(EMSDK_ROOT, 'emsdk.py')
 
diff --git a/tools/licenses/lib/paths.dart b/tools/licenses/lib/paths.dart
index b923099a3be5f..22666b8a3812f 100644
--- a/tools/licenses/lib/paths.dart
+++ b/tools/licenses/lib/paths.dart
@@ -63,6 +63,7 @@ final Set<String> skippedPaths = <String>{
   r'flutter/third_party/glfw/deps', // Only used by examples and tests; not linked in build.
   r'flutter/third_party/glfw/docs',
   r'flutter/third_party/gn',
+  r'flutter/third_party/google_fonts_for_unit_tests', // only used in web unit tests
   r'flutter/third_party/harfbuzz/docs',
   r'flutter/third_party/harfbuzz/util', // utils are command line tools that do not end up in the binary
   r'flutter/third_party/icu/filters',
@@ -208,7 +209,6 @@ final Set<String> skippedPaths = <String>{
   r'third_party/dart/third_party/pkg_tested',
   r'third_party/dart/third_party/requirejs', // only used by DDC
   r'third_party/dart/tools', // not shipped in binary
-  r'third_party/google_fonts_for_unit_tests', // only used in web unit tests
   r'third_party/gradle',
   r'third_party/java', // only used for Android builds
   r'third_party/libcxx/benchmarks',