Fix tests

src/test/shell/integration/discard_graph_edges_test.sh

diff --git a/src/test/shell/integration/discard_graph_edges_test.sh b/src/test/shell/integration/discard_graph_edges_test.sh
index 26b5374..301fdc7 100755
--- a/src/test/shell/integration/discard_graph_edges_test.sh
+++ b/src/test/shell/integration/discard_graph_edges_test.sh
@@ -274,13 +274,13 @@
   # is still low (external packages don't contribute there). We can lower this
   # number again once we remove WORKSPACE logic and move repo rules to not use
   # Package anymore.
-  [[ "$package_count" -le 53 ]] \
+  [[ "$package_count" -le 56 ]] \
       || fail "package count $package_count too high"
   globs_count="$(extract_histogram_count "$histo_file" "GlobsValue$")"
   [[ "$globs_count" -le 1 ]] \
       || fail "globs count $globs_count too high"
   module_count="$(extract_histogram_count "$histo_file" 'eval.Module$')"
-  [[ "$module_count" -le 270 ]] \
+  [[ "$module_count" -le 295 ]] \
       || fail "Module count $module_count too high"
   ct_count="$(extract_histogram_count "$histo_file" \
        'RuleConfiguredTarget$')"

tools/BUILD

diff --git a/tools/BUILD b/tools/BUILD
index 3605805..de2d4cd 100644
--- a/tools/BUILD
+++ b/tools/BUILD
@@ -77,6 +77,7 @@
     name = "bzl_srcs",
     srcs = [
         "//tools:build_defs.bzl",
+        "//tools/android:bzl_srcs",
         "//tools/build_defs:bzl_srcs",
         "//tools/build_rules:bzl_srcs",
         "//tools/cpp:bzl_srcs",

tools/android/BUILD.tools

diff --git a/tools/android/BUILD.tools b/tools/android/BUILD.tools
index e69de29..e4ced39 100644
--- a/tools/android/BUILD.tools
+++ b/tools/android/BUILD.tools
@@ -0,0 +1,5 @@
+filegroup(
+    name = "bzl_srcs",
+    srcs = glob(["*.bzl"]),
+    visibility = ["//tools:__pkg__"],
+)