diff --git a/.gn b/.gn
index bc19d4b6c..b1386c9a7 100644
--- a/.gn
+++ b/.gn
@@ -35,6 +35,7 @@ exec_script_whitelist = [
   "//build/config/linux/pkg_config.gni",
   "//build/config/mac/mac_sdk.gni",
   "//build/config/posix/BUILD.gn",
+  "//build/config/sysroot.gni",
   "//build/config/win/visual_studio_version.gni",
   "//build/gn_helpers.py",
   "//build/gypi_to_gn.py",
diff --git a/setup_links.py b/setup_links.py
index 99b526076..975ef9047 100755
--- a/setup_links.py
+++ b/setup_links.py
@@ -87,6 +87,7 @@ if 'android' in target_os:
     'third_party/android_tools',
     'third_party/appurify-python',
     'third_party/ashmem',
+    'third_party/catapult',
     'third_party/ijar',
     'third_party/jsr-305',
     'third_party/junit',
@@ -98,7 +99,8 @@ if 'android' in target_os:
     'third_party/robolectric',
     'tools/android',
     'tools/grit',
-    'tools/relocation_packer'
+    'tools/relocation_packer',
+    'tools/telemetry',
   ]
 if 'ios' in target_os:
   DIRECTORIES.append('third_party/class-dump')