diff --git a/AUTHORS b/AUTHORS
index d3f373b890f91..984e9f525e7c1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -15,4 +15,5 @@ Simon Lightfoot <simon@devangels.london>
 Dwayne Slater <ds84182@gmail.com>
 Tetsuhiro Ueda <najeira@gmail.com>
 shoryukenn <naifu.guan@gmail.com>
-SOTEC GmbH & Co. KG <sotec-contributors@sotec.eu>
\ No newline at end of file
+SOTEC GmbH & Co. KG <sotec-contributors@sotec.eu>
+Hidenori Matsubayashi <Hidenori.Matsubayashi@sony.com>
\ No newline at end of file
diff --git a/BUILD.gn b/BUILD.gn
index 0f1c68a8990c5..def7ccfe808d1 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -45,6 +45,11 @@ group("flutter") {
     "//flutter/sky",
   ]
 
+  # Flutter SDK artifacts should only be built when either doing host builds, or
+  # for cross-compiled desktop targets.
+  build_engine_artifacts =
+      current_toolchain == host_toolchain || (is_linux && !is_chromeos)
+
   # If enbaled, compile the SDK / snapshot.
   if (!is_fuchsia) {
     public_deps += [
@@ -52,7 +57,7 @@ group("flutter") {
       "//flutter/lib/snapshot:kernel_platform_files",
     ]
 
-    if (current_toolchain == host_toolchain) {
+    if (build_engine_artifacts) {
       public_deps += [
         "//flutter/flutter_frontend_server:frontend_server",
         "//third_party/dart:create_sdk",
@@ -64,8 +69,7 @@ group("flutter") {
     }
   }
 
-  # If on the host, compile tools.
-  if (current_toolchain == host_toolchain) {
+  if (build_engine_artifacts) {
     public_deps += [
       "//flutter/shell/testing",
       "//flutter/tools/const_finder",
diff --git a/DEPS b/DEPS
index 133214bd28c27..766f99f784f7e 100644
--- a/DEPS
+++ b/DEPS
@@ -616,7 +616,7 @@ hooks = [
     ],
   },
   {
-    'name': 'linux_sysroot',
+    'name': 'linux_sysroot_x64',
     'pattern': '.',
     'condition': 'download_linux_deps',
     'action': [
@@ -624,6 +624,15 @@ hooks = [
       'src/build/linux/sysroot_scripts/install-sysroot.py',
       '--arch=x64'],
   },
+  {
+    'name': 'linux_sysroot_arm64',
+    'pattern': '.',
+    'condition': 'download_linux_deps',
+    'action': [
+      'python',
+      'src/build/linux/sysroot_scripts/install-sysroot.py',
+      '--arch=arm64'],
+  },
   {
     'name': 'dart package config',
     'pattern': '.',