Add a fixed adb binary to our browser tests (#8963)

This was tested and verified by manually building and deploying to the
MH lab.

Bug: 483488213

Author: SortaCookie

cobalt/testing/browser_tests/tools/Dockerfile

@@ -4,7 +4,7 @@ FROM ubuntu@sha256:c7eb020043d8fc2ae0793fb35a37bff1cf33f156d4d4b12ccc7f3ef8706c3
 # Install base utilities, Android test dependencies (adb, netcat),
 # and Linux test dependencies (GUI/X11 libraries).
 RUN apt-get update && apt-get install -y \
-    adb \
+    unzip \
     netcat-openbsd \
     python3 \
     ca-certificates \
@@ -22,6 +22,7 @@ RUN apt-get update && apt-get install -y \
     libxrandr2 \
     libgbm1 \
     socat \
+    iproute2 \
     usbutils \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
@@ -32,4 +33,13 @@ WORKDIR /opt/cobalt_browsertests
 # Expects cobalt_browsertests_artifacts.tar.gz to be in the build context.
 ADD cobalt_browsertests_artifacts.tar.gz .
 
+# Extract platform-tools if available
+ENV PATH="/opt/platform-tools:${PATH}"
+RUN ls
+RUN if [ -f ./tools/platform-tools.zip ]; then \
+    unzip ./tools/platform-tools.zip -d /opt && rm ./tools/platform-tools.zip; \
+else \
+    echo "No platform-tools found, skipping..."; \
+fi
+
 ENTRYPOINT ["python3", "run_tests.py"]

cobalt/testing/browser_tests/tools/collect_test_artifacts.py

@@ -128,6 +128,12 @@ def main():
       choices=['xz', 'gz', 'zstd'],
       default='gz',
       help='The compression algorithm to use.')
+  parser.add_argument(
+      '--adb_platform_tools',
+      type=str,
+      default=('cobalt/testing/browser_tests/tools/'
+               'platform-tools_r33.0.1-linux.zip'),
+      help='The zip file to incorporate into the tarball.')
   args = parser.parse_args()
 
   if args.output_dir:
@@ -157,6 +163,12 @@ def main():
                         build_dir)
         continue
 
+      adb_platform_tools = args.adb_platform_tools
+      if is_android and adb_platform_tools:
+        copy_if_needed(adb_platform_tools,
+                       os.path.join(stage_dir, 'tools/platform-tools.zip'),
+                       copied_sources)
+
       test_runner_rel = get_test_runner(build_dir, is_android)
       logging.info('Processing build directory: %s', build_dir)