diff --git a/src/chrome/BUILD.gn b/src/chrome/BUILD.gn
index dd0a9003..be9f4624 100644
--- a/src/chrome/BUILD.gn
+++ b/src/chrome/BUILD.gn
@@ -17,7 +17,6 @@ import("//build/toolchain/toolchain.gni")
 import("//chrome/chrome_paks.gni")
 import("//chrome/common/features.gni")
 import("//chrome/process_version_rc_template.gni")
-import("//components/exo/buildflags.gni")
 import("//components/gwp_asan/buildflags/buildflags.gni")
 import("//components/nacl/features.gni")
 import("//components/optimization_guide/features.gni")
@@ -467,6 +466,7 @@ if (is_win) {
       "--breakpad=0",
       "--scm=1",
       "--bundle_id=$chrome_mac_bundle_id",
+      "--privileged_helper_id=$privileged_helper_name",
     ]
     if (is_chrome_branded) {
       args += [ "--keystone=1" ]
@@ -476,9 +476,6 @@ if (is_win) {
     } else {
       args += [ "--keystone=0" ]
     }
-    if (enable_chromium_updater) {
-      args += [ "--privileged_helper_id=$privileged_helper_name" ]
-    }
   }
 
   mac_app_bundle("chrome_app") {
@@ -499,6 +496,7 @@ if (is_win) {
       ":chrome_app_strings_bundle_data",
       ":chrome_resources",
       ":chrome_versioned_bundle_data",
+      ":chromium_updater_privileged_helper",
       "//base/allocator:early_zone_registration_mac",
       "//build:branding_buildflags",
       "//chrome/common:buildflags",
@@ -529,10 +527,6 @@ if (is_win) {
       # for runtime_deps at create_bundle nodes (https://crbug.com/1010347).
       data_deps = [ ":chrome_framework" ]
     }
-
-    if (enable_chromium_updater) {
-      deps += [ ":chromium_updater_privileged_helper" ]
-    }
   }
 
   if (verify_dynamic_libraries) {
@@ -657,15 +651,13 @@ if (is_win) {
     }
   }
 
-  if (enable_chromium_updater) {
-    bundle_data("chromium_updater_privileged_helper") {
-      sources = [ "$root_out_dir/$privileged_helper_name" ]
-      outputs = [
-        "{{bundle_contents_dir}}/Library/LaunchServices/{{source_file_part}}",
-      ]
+  bundle_data("chromium_updater_privileged_helper") {
+    sources = [ "$root_out_dir/$privileged_helper_name" ]
+    outputs = [
+      "{{bundle_contents_dir}}/Library/LaunchServices/{{source_file_part}}",
+    ]
 
-      public_deps = [ "//chrome/updater/mac:privileged_helper" ]
-    }
+    public_deps = [ "//chrome/updater/mac:privileged_helper" ]
   }
 
   action("clean_up_old_versions") {
@@ -897,18 +889,16 @@ if (is_win) {
       }
     }
 
-    if (enable_chromium_updater) {
-      if (is_chrome_branded) {
-        sources += [ "//third_party/updater/chrome_mac_universal_prod/${updater_product_full_name}.app" ]
-      } else {
-        sources += [ "$root_out_dir/${updater_product_full_name}.app" ]
+    if (is_chrome_branded) {
+      sources += [ "//third_party/updater/chrome_mac_universal_prod/${updater_product_full_name}.app" ]
+    } else {
+      sources += [ "$root_out_dir/${updater_product_full_name}.app" ]
 
-        public_deps += [
-          "//chrome/updater/mac:browser_install_script",
-          "//chrome/updater/mac:updater_bundle",
-          "//chrome/updater/mac:updater_install_script",
-        ]
-      }
+      public_deps += [
+        "//chrome/updater/mac:browser_install_script",
+        "//chrome/updater/mac:updater_bundle",
+        "//chrome/updater/mac:updater_install_script",
+      ]
     }
   }
 
@@ -1418,7 +1408,7 @@ group("dependencies") {
     public_deps += [ "//ppapi/host" ]
   }
 
-  if (enable_basic_printing) {
+  if (enable_printing) {
     public_deps += [ "//printing" ]
   }
 
@@ -1627,10 +1617,6 @@ if (is_android) {
     ]
   }
 
-  java_cpp_enum("instant_apps_reasons_enum_javagen") {
-    sources = [ "browser/android/instantapps/instant_apps_settings.cc" ]
-  }
-
   java_cpp_enum("supervised_user_url_filter_enum_javagen") {
     sources = [ "browser/supervised_user/supervised_user_url_filter.h" ]
   }
@@ -1849,6 +1835,22 @@ if (is_linux || is_chromeos) {
 }
 
 if (is_chromeos_lacros && is_official_build) {
+  # This target is responsible for stripping symbols out of lacros files.
+  # Adding/removing targets here, you also need a corresponding change
+  # in src-internal for the release builder.
+  group("strip_lacros_files") {
+    deps = [
+      ":strip_chrome_binary",
+      ":strip_chrome_crashpad_handler",
+      ":strip_libegl_so",
+      ":strip_libglesv2_so",
+      ":strip_nacl_helper",
+    ]
+    if (target_cpu == "arm" || target_cpu == "arm64") {
+      deps += [ ":strip_nacl_helper_bootstrap" ]
+    }
+  }
+
   # This will strip chrome binary and produce chrome.debug with symbols.
   strip_binary("strip_chrome_binary") {
     binary_input = "$root_out_dir/chrome"
@@ -1856,4 +1858,40 @@ if (is_chromeos_lacros && is_official_build) {
     stripped_binary_output = "$root_out_dir/chrome.stripped"
     deps = [ ":chrome" ]
   }
+  strip_binary("strip_chrome_crashpad_handler") {
+    binary_input = "$root_out_dir/chrome_crashpad_handler"
+    symbol_output = "$root_out_dir/chrome_crashpad_handler.debug"
+    stripped_binary_output = "$root_out_dir/chrome_crashpad_handler.stripped"
+    deps = [ "//components/crash/core/app:chrome_crashpad_handler" ]
+  }
+  strip_binary("strip_libegl_so") {
+    binary_input = "$root_out_dir/libEGL.so"
+    symbol_output = "$root_out_dir/libEGL.so.debug"
+    stripped_binary_output = "$root_out_dir/libEGL.so.stripped"
+    deps = [ "//third_party/angle:libEGL" ]
+  }
+  strip_binary("strip_libglesv2_so") {
+    binary_input = "$root_out_dir/libGLESv2.so"
+    symbol_output = "$root_out_dir/libGLESv2.so.debug"
+    stripped_binary_output = "$root_out_dir/libGLESv2.so.stripped"
+    deps = [ "//third_party/angle:libGLESv2" ]
+  }
+  strip_binary("strip_nacl_helper") {
+    binary_input = "$root_out_dir/nacl_helper"
+    symbol_output = "$root_out_dir/nacl_helper.debug"
+    stripped_binary_output = "$root_out_dir/nacl_helper.stripped"
+    deps = [ "//components/nacl/loader:nacl_helper" ]
+  }
+  if (target_cpu == "arm" || target_cpu == "arm64") {
+    strip_binary("strip_nacl_helper_bootstrap") {
+      binary_input = "$root_out_dir/nacl_helper_bootstrap"
+      symbol_output = "$root_out_dir/nacl_helper_bootstrap.debug"
+      stripped_binary_output = "$root_out_dir/nacl_helper_bootstrap.stripped"
+      if (target_cpu == "arm") {
+        deps = [ "//native_client/src/trusted/service_runtime/linux:bootstrap" ]
+      } else {
+        deps = [ "//components/nacl/loader:nacl_helper_bootstrap" ]
+      }
+    }
+  }
 }