From bfcc52e0b9f4a947ce11b08af2e2b06c00c49de2 Mon Sep 17 00:00:00 2001
From: Byoungchan Lee <byoungchan.lee@gmx.com>
Date: Thu, 30 Apr 2026 10:39:53 +0900
Subject: [PATCH 1/3] android-instrumentation-testing: Setup project and add
 basic java target

---
 android/instrumentation-testing/.bazelrc              |  3 +++
 android/instrumentation-testing/.bazelversion         |  1 +
 android/instrumentation-testing/MODULE.bazel          |  3 +++
 .../app/src/main/AndroidManifest.xml                  |  2 ++
 .../instrumentation-testing/app/src/main/BUILD.bazel  |  9 +++++++++
 .../com/example/android/instrumentation/Greeter.java  | 11 +++++++++++
 6 files changed, 29 insertions(+)
 create mode 100644 android/instrumentation-testing/.bazelrc
 create mode 100644 android/instrumentation-testing/.bazelversion
 create mode 100644 android/instrumentation-testing/MODULE.bazel
 create mode 100644 android/instrumentation-testing/app/src/main/AndroidManifest.xml
 create mode 100644 android/instrumentation-testing/app/src/main/BUILD.bazel
 create mode 100644 android/instrumentation-testing/app/src/main/java/com/example/android/instrumentation/Greeter.java

diff --git a/android/instrumentation-testing/.bazelrc b/android/instrumentation-testing/.bazelrc
new file mode 100644
index 000000000..f78e7f9e4
--- /dev/null
+++ b/android/instrumentation-testing/.bazelrc
@@ -0,0 +1,3 @@
+common --enable_bzlmod
+
+try-import %workspace%/.bazelrc.user
diff --git a/android/instrumentation-testing/.bazelversion b/android/instrumentation-testing/.bazelversion
new file mode 100644
index 000000000..47da986f8
--- /dev/null
+++ b/android/instrumentation-testing/.bazelversion
@@ -0,0 +1 @@
+9.1.0
diff --git a/android/instrumentation-testing/MODULE.bazel b/android/instrumentation-testing/MODULE.bazel
new file mode 100644
index 000000000..876e7bf03
--- /dev/null
+++ b/android/instrumentation-testing/MODULE.bazel
@@ -0,0 +1,3 @@
+module(name = "android_instrumentation_testing")
+
+bazel_dep(name = "rules_android", version = "0.7.2")
diff --git a/android/instrumentation-testing/app/src/main/AndroidManifest.xml b/android/instrumentation-testing/app/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..7f5abafe2
--- /dev/null
+++ b/android/instrumentation-testing/app/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.example.android.instrumentation" />
diff --git a/android/instrumentation-testing/app/src/main/BUILD.bazel b/android/instrumentation-testing/app/src/main/BUILD.bazel
new file mode 100644
index 000000000..378ae4a73
--- /dev/null
+++ b/android/instrumentation-testing/app/src/main/BUILD.bazel
@@ -0,0 +1,9 @@
+load("@rules_android//android:rules.bzl", "android_library")
+
+android_library(
+    name = "greeter_lib",
+    srcs = ["java/com/example/android/instrumentation/Greeter.java"],
+    custom_package = "com.example.android.instrumentation",
+    manifest = "AndroidManifest.xml",
+    visibility = ["//visibility:public"],
+)
diff --git a/android/instrumentation-testing/app/src/main/java/com/example/android/instrumentation/Greeter.java b/android/instrumentation-testing/app/src/main/java/com/example/android/instrumentation/Greeter.java
new file mode 100644
index 000000000..0d62b8899
--- /dev/null
+++ b/android/instrumentation-testing/app/src/main/java/com/example/android/instrumentation/Greeter.java
@@ -0,0 +1,11 @@
+package com.example.android.instrumentation;
+
+public final class Greeter {
+    public String greet(String name) {
+        String normalizedName = name == null ? "" : name.trim();
+        if (normalizedName.isEmpty()) {
+            return "Hello, Android!";
+        }
+        return "Hello, " + normalizedName + "!";
+    }
+}

From 700bd8801db2394f53b3ca72016ebd99bcb5e769 Mon Sep 17 00:00:00 2001
From: Byoungchan Lee <byoungchan.lee@gmx.com>
Date: Thu, 30 Apr 2026 21:16:14 +0900
Subject: [PATCH 2/3] android-instrumentation-testing: Add local-device test
 sample

Add a Bzlmod-only Android instrumentation testing sample that builds a
small Java Android app and runs an AndroidX/JUnit4 instrumentation test
on a connected local device.

Add a small Starlark android_instrumentation_test rule that consumes
rules_android's ApkInfo and AndroidInstrumentationInfo providers. The
rule adds the target APK, instrumentation APK, Android SDK tools, and
AndroidX Test host-side runner to runfiles, then leaves local device
selection to the local_device Bazel config.

Vendor AndroidX Test through a separate third_party/android-test Bazel
module and repository-rule overlay. Keeping AndroidX Test in its own
module avoids forcing the root sample module to carry AndroidX Test's
dependency graph and overrides directly.

Patch the generated AndroidX Test repository for local retail devices:
make dalvik.vm.dexopt-flags updates best-effort because upstream assumes
a rooted/userdebug device, and fall back to /data/anr/traces.txt when
dalvik.vm.stack-trace-file is absent. The sample also uses
@RunWith(AndroidJUnit4.class) so AndroidX Test's dex parser discovers
JUnit4 methods without relying on legacy android.test APIs.

Pass Bazel's Android SDK dexdump into the AndroidX Test host runner
instead of using AndroidX Test's embedded Linux dexdump_annotations
resource. The embedded binary does not run on macOS, which breaks local
device test discovery before instrumentation starts.

Overlay TestInfoRepository so the generated AndroidX Test repository
uses modern SDK-compatible dexdump arguments, canonicalizes APK paths
before invoking dexdump, and normalizes the modern annotation preamble
back into the XML shape expected by AndroidX Test's legacy parser.

Add a focused normalizer test that feeds the normalized output through
DumpUtils.parseDexDump. This covers both JUnit4 annotation discovery and
the dalvik.annotation.AnnotationDefault parser behavior needed after
switching away from the embedded binary.
---
 android/instrumentation-testing/.bazelignore  |   1 +
 android/instrumentation-testing/.bazelrc      |   7 +
 android/instrumentation-testing/MODULE.bazel  |  12 +
 .../app/src/main/AndroidManifest.xml          |   9 +-
 .../app/src/main/AndroidTestManifest.xml      |  13 +
 .../app/src/main/BUILD.bazel                  |  30 +-
 .../GreeterInstrumentationTest.java           |  20 ++
 .../instrumentation-testing/bazel/BUILD.bazel |   1 +
 .../bazel/android_instrumentation_test.bzl    | 117 +++++++
 .../bazel/android_instrumentation_test.sh.tpl |  91 +++++
 .../third_party/android-test/.bazelignore     |   1 +
 .../third_party/android-test/BUILD.bazel      |   0
 .../third_party/android-test/MODULE.bazel     | 108 ++++++
 .../third_party/android-test/extensions.bzl   |   8 +
 .../third_party/android-test/overlay/BUILD    |  67 ++++
 .../maven/axt_android_aar.bzl                 | 129 ++++++++
 .../build_extensions/maven/axt_maven_apk.bzl  |  40 +++
 .../build_extensions/maven/maven_info.bzl     | 211 ++++++++++++
 .../android-test/overlay/opensource/BUILD     |  33 ++
 .../overlay/opensource/androidx/BUILD         |  29 ++
 .../overlay/opensource/auto_value/BUILD       |  19 ++
 .../overlay/opensource/dagger/BUILD           |  30 ++
 .../java/androidx/test/BUILD                  |  98 ++++++
 .../java/androidx/test/orchestrator/BUILD     |  46 +++
 .../android_test_orchestrator/stubapp/BUILD   |  44 +++
 .../runner/monitor/java/androidx/test/BUILD   | 136 ++++++++
 .../android-test/overlay/services/BUILD       |  57 ++++
 .../java/androidx/test/services/events/BUILD  |  31 ++
 .../overlay/services/proguard_library.cfg     |  55 +++
 .../overlay/services/shellexecutor/BUILD      |  31 ++
 .../test/services/shellexecutor/BUILD         | 115 +++++++
 .../androidx/test/services/speakeasy/BUILD    |  16 +
 .../test/services/speakeasy/client/BUILD      |  62 ++++
 .../speakeasy/compilehelp/hidden_api/BUILD    |  32 ++
 .../test/services/speakeasy/server/BUILD      |  46 +++
 .../java/androidx/test/services/storage/BUILD |  95 ++++++
 .../androidx/test/services/storage/file/BUILD |  22 ++
 .../test/services/storage/provider/BUILD      |  22 ++
 .../tools/android/emulator/BUILD.bazel        | 313 ++++++++++++++++++
 .../apps/common/testing/broker/BUILD.bazel    | 311 +++++++++++++++++
 .../broker/LocalAdbServerDeviceBroker.java    | 292 ++++++++++++++++
 .../broker/ModernDexDumpOutputNormalizer.java | 141 ++++++++
 .../ModernDexDumpOutputNormalizerTest.java    | 176 ++++++++++
 .../testing/broker/TestInfoRepository.java    | 300 +++++++++++++++++
 .../common/testing/broker/shell/BUILD.bazel   |  15 +
 .../testing/suite/AndroidDeviceTestSuite.java | 253 ++++++++++++++
 .../apps/common/testing/suite/BUILD.bazel     |  59 ++++
 .../apps/common/testing/suite/dex/BUILD.bazel |  17 +
 .../suite/filter/AnnotationPredicates.java    | 212 ++++++++++++
 .../common/testing/suite/filter/BUILD.bazel   |  20 ++
 .../testrunner/testsuitepbutil/BUILD.bazel    |  22 ++
 .../tools/device_broker/proto/BUILD.bazel     |  36 ++
 .../third_party/android-test/repository.bzl   |  67 ++++
 53 files changed, 4116 insertions(+), 2 deletions(-)
 create mode 100644 android/instrumentation-testing/.bazelignore
 create mode 100644 android/instrumentation-testing/app/src/main/AndroidTestManifest.xml
 create mode 100644 android/instrumentation-testing/app/src/main/java/com/example/android/instrumentation/GreeterInstrumentationTest.java
 create mode 100644 android/instrumentation-testing/bazel/BUILD.bazel
 create mode 100644 android/instrumentation-testing/bazel/android_instrumentation_test.bzl
 create mode 100644 android/instrumentation-testing/bazel/android_instrumentation_test.sh.tpl
 create mode 100644 android/instrumentation-testing/third_party/android-test/.bazelignore
 create mode 100644 android/instrumentation-testing/third_party/android-test/BUILD.bazel
 create mode 100644 android/instrumentation-testing/third_party/android-test/MODULE.bazel
 create mode 100644 android/instrumentation-testing/third_party/android-test/extensions.bzl
 create mode 100644 android/instrumentation-testing/third_party/android-test/overlay/BUILD
 create mode 100644 android/instrumentation-testing/third_party/android-test/overlay/build_extensions/maven/axt_android_aar.bzl
 create mode 100644 android/instrumentation-testing/third_party/android-test/overlay/build_extensions/maven/axt_maven_apk.bzl
 create mode 100644 android/instrumentation-testing/third_party/android-test/overlay/build_extensions/maven/maven_info.bzl
 create mode 100644 android/instrumentation-testing/third_party/android-test/overlay/opensource/BUILD
 create mode 100644 android/instrumentation-testing/third_party/android-test/overlay/opensource/androidx/BUILD
 create mode 100644 android/instrumentation-testing/third_party/android-test/overlay/opensource/auto_value/BUILD
 create mode 100644 android/instrumentation-testing/third_party/android-test/overlay/opensource/dagger/BUILD
 create mode 100644 android/instrumentation-testing/third_party/android-test/overlay/runner/android_junit_runner/java/androidx/test/BUILD
 create mode 100644 android/instrumentation-testing/third_party/android-test/overlay/runner/android_test_orchestrator/java/androidx/test/orchestrator/BUILD
 create mode 100644 android/instrumentation-testing/third_party/android-test/overlay/runner/android_test_orchestrator/stubapp/BUILD
 create mode 100644 android/instrumentation-testing/third_party/android-test/overlay/runner/monitor/java/androidx/test/BUILD
 create mode 100644 android/instrumentation-testing/third_party/android-test/overlay/services/BUILD
 create mode 100644 android/instrumentation-testing/third_party/android-test/overlay/services/events/java/androidx/test/services/events/BUILD
 create mode 100644 android/instrumentation-testing/third_party/android-test/overlay/services/proguard_library.cfg
 create mode 100644 android/instrumentation-testing/third_party/android-test/overlay/services/shellexecutor/BUILD
 create mode 100644 android/instrumentation-testing/third_party/android-test/overlay/services/shellexecutor/java/androidx/test/services/shellexecutor/BUILD
 create mode 100644 android/instrumentation-testing/third_party/android-test/overlay/services/speakeasy/java/androidx/test/services/speakeasy/BUILD
 create mode 100644 android/instrumentation-testing/third_party/android-test/overlay/services/speakeasy/java/androidx/test/services/speakeasy/client/BUILD
 create mode 100644 android/instrumentation-testing/third_party/android-test/overlay/services/speakeasy/java/androidx/test/services/speakeasy/compilehelp/hidden_api/BUILD
 create mode 100644 android/instrumentation-testing/third_party/android-test/overlay/services/speakeasy/java/androidx/test/services/speakeasy/server/BUILD
 create mode 100644 android/instrumentation-testing/third_party/android-test/overlay/services/storage/java/androidx/test/services/storage/BUILD
 create mode 100644 android/instrumentation-testing/third_party/android-test/overlay/services/storage/java/androidx/test/services/storage/file/BUILD
 create mode 100644 android/instrumentation-testing/third_party/android-test/overlay/services/storage/java/androidx/test/services/storage/provider/BUILD
 create mode 100644 android/instrumentation-testing/third_party/android-test/overlay/tools/android/emulator/BUILD.bazel
 create mode 100644 android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/broker/BUILD.bazel
 create mode 100644 android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/broker/LocalAdbServerDeviceBroker.java
 create mode 100644 android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/broker/ModernDexDumpOutputNormalizer.java
 create mode 100644 android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/broker/ModernDexDumpOutputNormalizerTest.java
 create mode 100644 android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/broker/TestInfoRepository.java
 create mode 100644 android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/broker/shell/BUILD.bazel
 create mode 100644 android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/suite/AndroidDeviceTestSuite.java
 create mode 100644 android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/suite/BUILD.bazel
 create mode 100644 android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/suite/dex/BUILD.bazel
 create mode 100644 android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/suite/filter/AnnotationPredicates.java
 create mode 100644 android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/suite/filter/BUILD.bazel
 create mode 100644 android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/testrunner/testsuitepbutil/BUILD.bazel
 create mode 100644 android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/proto/BUILD.bazel
 create mode 100644 android/instrumentation-testing/third_party/android-test/repository.bzl

diff --git a/android/instrumentation-testing/.bazelignore b/android/instrumentation-testing/.bazelignore
new file mode 100644
index 000000000..ba4c7139b
--- /dev/null
+++ b/android/instrumentation-testing/.bazelignore
@@ -0,0 +1 @@
+third_party/android-test/overlay
diff --git a/android/instrumentation-testing/.bazelrc b/android/instrumentation-testing/.bazelrc
index f78e7f9e4..befb08f9f 100644
--- a/android/instrumentation-testing/.bazelrc
+++ b/android/instrumentation-testing/.bazelrc
@@ -1,3 +1,10 @@
 common --enable_bzlmod
+common --java_language_version=17
+common --java_runtime_version=remotejdk_17
+common --tool_java_language_version=17
+common --tool_java_runtime_version=remotejdk_17
+
+test:local_device --test_strategy=exclusive
+test:local_device --test_arg=--device_broker_type=LOCAL_ADB_SERVER
 
 try-import %workspace%/.bazelrc.user
diff --git a/android/instrumentation-testing/MODULE.bazel b/android/instrumentation-testing/MODULE.bazel
index 876e7bf03..91ea8d589 100644
--- a/android/instrumentation-testing/MODULE.bazel
+++ b/android/instrumentation-testing/MODULE.bazel
@@ -1,3 +1,15 @@
 module(name = "android_instrumentation_testing")
 
+bazel_dep(name = "android_test_overlay", version = "0.0.0")
 bazel_dep(name = "rules_android", version = "0.7.2")
+
+android_sdk_repository_extension = use_extension("@rules_android//rules/android_sdk_repository:rule.bzl", "android_sdk_repository_extension")
+use_repo(android_sdk_repository_extension, "androidsdk")
+
+android_test = use_extension("@android_test_overlay//:extensions.bzl", "android_test")
+use_repo(android_test, "android_test_support")
+
+local_path_override(
+    module_name = "android_test_overlay",
+    path = "third_party/android-test",
+)
diff --git a/android/instrumentation-testing/app/src/main/AndroidManifest.xml b/android/instrumentation-testing/app/src/main/AndroidManifest.xml
index 7f5abafe2..20733fa6b 100644
--- a/android/instrumentation-testing/app/src/main/AndroidManifest.xml
+++ b/android/instrumentation-testing/app/src/main/AndroidManifest.xml
@@ -1,2 +1,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.instrumentation" />
+    package="com.example.android.instrumentation">
+
+    <uses-sdk
+        android:minSdkVersion="23"
+        android:targetSdkVersion="36" />
+
+    <application />
+</manifest>
diff --git a/android/instrumentation-testing/app/src/main/AndroidTestManifest.xml b/android/instrumentation-testing/app/src/main/AndroidTestManifest.xml
new file mode 100644
index 000000000..261cce334
--- /dev/null
+++ b/android/instrumentation-testing/app/src/main/AndroidTestManifest.xml
@@ -0,0 +1,13 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.example.android.instrumentation.test">
+
+    <uses-sdk
+        android:minSdkVersion="23"
+        android:targetSdkVersion="36" />
+
+    <instrumentation
+        android:name="androidx.test.runner.AndroidJUnitRunner"
+        android:targetPackage="com.example.android.instrumentation" />
+
+    <application />
+</manifest>
diff --git a/android/instrumentation-testing/app/src/main/BUILD.bazel b/android/instrumentation-testing/app/src/main/BUILD.bazel
index 378ae4a73..bb7a04eb4 100644
--- a/android/instrumentation-testing/app/src/main/BUILD.bazel
+++ b/android/instrumentation-testing/app/src/main/BUILD.bazel
@@ -1,4 +1,11 @@
-load("@rules_android//android:rules.bzl", "android_library")
+load("@rules_android//android:rules.bzl", "android_binary", "android_library")
+load("//bazel:android_instrumentation_test.bzl", "android_instrumentation_test")
+
+android_binary(
+    name = "app",
+    manifest = "AndroidManifest.xml",
+    deps = [":greeter_lib"],
+)
 
 android_library(
     name = "greeter_lib",
@@ -7,3 +14,24 @@ android_library(
     manifest = "AndroidManifest.xml",
     visibility = ["//visibility:public"],
 )
+
+android_binary(
+    name = "greeter_test_app",
+    testonly = True,
+    srcs = ["java/com/example/android/instrumentation/GreeterInstrumentationTest.java"],
+    instruments = ":app",
+    manifest = "AndroidTestManifest.xml",
+    deps = [
+        ":greeter_lib",
+        "@android_test_support//:junit",
+        "@android_test_support//runner/android_junit_runner",
+    ],
+)
+
+android_instrumentation_test(
+    name = "greeter_instrumentation_test",
+    bootstrap_instrumentation_package = "com.example.android.instrumentation.test",
+    tags = ["manual"],
+    test_app = ":greeter_test_app",
+    test_packages = ["com.example.android.instrumentation.test"],
+)
diff --git a/android/instrumentation-testing/app/src/main/java/com/example/android/instrumentation/GreeterInstrumentationTest.java b/android/instrumentation-testing/app/src/main/java/com/example/android/instrumentation/GreeterInstrumentationTest.java
new file mode 100644
index 000000000..5c214a55a
--- /dev/null
+++ b/android/instrumentation-testing/app/src/main/java/com/example/android/instrumentation/GreeterInstrumentationTest.java
@@ -0,0 +1,20 @@
+package com.example.android.instrumentation;
+
+import static org.junit.Assert.assertEquals;
+
+import androidx.test.runner.AndroidJUnit4;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public final class GreeterInstrumentationTest {
+    @Test
+    public void testDefaultGreeting() {
+        assertEquals("Hello, Android!", new Greeter().greet(null));
+    }
+
+    @Test
+    public void testNamedGreeting() {
+        assertEquals("Hello, Bazel!", new Greeter().greet(" Bazel "));
+    }
+}
diff --git a/android/instrumentation-testing/bazel/BUILD.bazel b/android/instrumentation-testing/bazel/BUILD.bazel
new file mode 100644
index 000000000..410562035
--- /dev/null
+++ b/android/instrumentation-testing/bazel/BUILD.bazel
@@ -0,0 +1 @@
+exports_files(["android_instrumentation_test.sh.tpl"])
diff --git a/android/instrumentation-testing/bazel/android_instrumentation_test.bzl b/android/instrumentation-testing/bazel/android_instrumentation_test.bzl
new file mode 100644
index 000000000..ac738e2c3
--- /dev/null
+++ b/android/instrumentation-testing/bazel/android_instrumentation_test.bzl
@@ -0,0 +1,117 @@
+load("@rules_android//providers:providers.bzl", "AndroidInstrumentationInfo", "ApkInfo")
+
+def _apk_from_target(target, attr_name):
+    if ApkInfo in target:
+        apk = target[ApkInfo].signed_apk
+        if not apk:
+            fail("%s must provide a signed APK" % attr_name)
+        return apk
+
+    apks = [f for f in target[DefaultInfo].files.to_list() if f.basename.endswith(".apk")]
+    if len(apks) != 1:
+        fail("%s must provide exactly one .apk file, got %d" % (attr_name, len(apks)))
+    return apks[0]
+
+def _runfiles_path(file):
+    path = file.short_path
+    if path.startswith("../"):
+        return path[3:]
+    return path
+
+def _apparent_label(label):
+    return "//%s:%s" % (label.package, label.name)
+
+def _android_instrumentation_test_impl(ctx):
+    test_app = ctx.attr.test_app
+    test_apk = test_app[ApkInfo].signed_apk
+    target_apk = test_app[AndroidInstrumentationInfo].target.signed_apk
+    if not target_apk:
+        fail("test_app must set instruments to an android_binary that produces a signed APK")
+
+    support_apks = [_apk_from_target(apk, "support_apks") for apk in ctx.attr.support_apks]
+    executable = ctx.actions.declare_file(ctx.label.name)
+
+    substitutions = {
+        "%workspace%": ctx.workspace_name,
+        "%test_label%": _apparent_label(ctx.label),
+        "%test_entry_point%": _runfiles_path(ctx.executable._test_entry_point),
+        "%adb%": _runfiles_path(ctx.file._adb),
+        "%aapt%": _runfiles_path(ctx.executable._aapt),
+        "%dexdump%": _runfiles_path(ctx.file._dexdump),
+        "%target_apk%": _runfiles_path(target_apk),
+        "%instrumentation_apk%": _runfiles_path(test_apk),
+        "%support_apks%": " ".join([_runfiles_path(apk) for apk in support_apks]),
+        "%test_packages%": " ".join([
+            "additional_test_packages=%s" % package
+            for package in ctx.attr.test_packages
+        ]),
+        "%device_broker_type%": ctx.attr.device_broker_type,
+        "%bootstrap_instrumentation_package%": ctx.attr.bootstrap_instrumentation_package,
+        "%install_basic_services%": str(ctx.attr.install_basic_services).lower(),
+        "%install_test_services%": str(ctx.attr.install_test_services).lower(),
+        "%scan_target_package_for_tests%": str(ctx.attr.scan_target_package_for_tests).lower(),
+    }
+
+    ctx.actions.expand_template(
+        template = ctx.file._template,
+        output = executable,
+        substitutions = substitutions,
+        is_executable = True,
+    )
+
+    runfiles = ctx.runfiles(files = [
+        executable,
+        ctx.executable._test_entry_point,
+        ctx.file._adb,
+        ctx.executable._aapt,
+        ctx.file._dexdump,
+        target_apk,
+        test_apk,
+    ] + support_apks)
+    runfiles = runfiles.merge(ctx.attr._test_entry_point[DefaultInfo].default_runfiles)
+    runfiles = runfiles.merge(ctx.attr._aapt[DefaultInfo].default_runfiles)
+
+    return [DefaultInfo(
+        executable = executable,
+        runfiles = runfiles,
+    )]
+
+android_instrumentation_test = rule(
+    implementation = _android_instrumentation_test_impl,
+    attrs = {
+        "bootstrap_instrumentation_package": attr.string(),
+        "device_broker_type": attr.string(default = "LOCAL_ADB_SERVER"),
+        "install_basic_services": attr.bool(default = False),
+        "install_test_services": attr.bool(default = True),
+        "scan_target_package_for_tests": attr.bool(default = False),
+        "support_apks": attr.label_list(allow_files = [".apk"]),
+        "test_app": attr.label(
+            mandatory = True,
+            providers = [[ApkInfo, AndroidInstrumentationInfo]],
+        ),
+        "test_packages": attr.string_list(),
+        "_aapt": attr.label(
+            default = Label("@androidsdk//:aapt_binary"),
+            executable = True,
+            cfg = "exec",
+        ),
+        "_adb": attr.label(
+            default = Label("@androidsdk//:adb"),
+            allow_single_file = True,
+        ),
+        "_dexdump": attr.label(
+            default = Label("@androidsdk//:dexdump"),
+            allow_single_file = True,
+        ),
+        "_template": attr.label(
+            default = Label("//bazel:android_instrumentation_test.sh.tpl"),
+            allow_single_file = True,
+        ),
+        "_test_entry_point": attr.label(
+            default = Label("@android_test_support//:instrumentation_test_runner"),
+            executable = True,
+            cfg = "exec",
+        ),
+    },
+    test = True,
+)
diff --git a/android/instrumentation-testing/bazel/android_instrumentation_test.sh.tpl b/android/instrumentation-testing/bazel/android_instrumentation_test.sh.tpl
new file mode 100644
index 000000000..b56ea59cc
--- /dev/null
+++ b/android/instrumentation-testing/bazel/android_instrumentation_test.sh.tpl
@@ -0,0 +1,91 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+if [[ -z "${TEST_SRCDIR:-}" && -z "${RUNFILES_DIR:-}" ]]; then
+  echo "TEST_SRCDIR or RUNFILES_DIR must be set by Bazel test." >&2
+  exit 1
+fi
+
+workspace="%workspace%"
+
+function resolve_runfile() {
+  local path="$1"
+  local base
+  for base in "${RUNFILES_DIR:-}" "${TEST_SRCDIR:-}"; do
+    if [[ -z "${base}" ]]; then
+      continue
+    fi
+    if [[ -e "${base}/${path}" ]]; then
+      echo "${base}/${path}"
+      return
+    fi
+    if [[ -e "${base}/${workspace}/${path}" ]]; then
+      echo "${base}/${workspace}/${path}"
+      return
+    fi
+  done
+  echo "Could not resolve runfile: ${path}" >&2
+  exit 1
+}
+
+function join_runfiles() {
+  local separator="$1"
+  shift
+  local result=""
+  local path
+  for path in "$@"; do
+    if [[ -z "${path}" ]]; then
+      continue
+    fi
+    if [[ -n "${result}" ]]; then
+      result+="${separator}"
+    fi
+    result+="$(resolve_runfile "${path}")"
+  done
+  echo "${result}"
+}
+
+if [[ -z "${TESTBRIDGE_TEST_ONLY+set}" ]]; then
+  android_testbridge_test_only=""
+else
+  android_testbridge_test_only="${TESTBRIDGE_TEST_ONLY}"
+  unset TESTBRIDGE_TEST_ONLY
+fi
+
+test_entry_point="$(resolve_runfile "%test_entry_point%")"
+adb="$(resolve_runfile "%adb%")"
+aapt="$(resolve_runfile "%aapt%")"
+dexdump="$(resolve_runfile "%dexdump%")"
+target_apk="$(resolve_runfile "%target_apk%")"
+instrumentation_apk="$(resolve_runfile "%instrumentation_apk%")"
+support_apks="$(join_runfiles "," %support_apks%)"
+
+if [[ -n "${support_apks}" ]]; then
+  apks_to_install="${support_apks},${target_apk},${instrumentation_apk}"
+else
+  apks_to_install="${target_apk},${instrumentation_apk}"
+fi
+
+argv=$(cat <<END
+--aapt=${aapt} \
+--adb=${adb} \
+--dexdump_path=${dexdump} \
+--device_broker_type=%device_broker_type% \
+--apks_to_install=${apks_to_install} \
+--bootstrap_instrumentation_package=%bootstrap_instrumentation_package% \
+--install_basic_services=%install_basic_services% \
+--install_test_services=%install_test_services% \
+--scan_target_package_for_tests=%scan_target_package_for_tests% \
+%test_packages% \
+--test_label=%test_label% \
+--test_filter=${android_testbridge_test_only} \
+$@
+END
+)
+
+"${test_entry_point}" \
+  --wrapper_script_flag=--jvm_flag=--add-opens=java.base/java.lang=ALL-UNNAMED \
+  --wrapper_script_flag=--jvm_flag=--add-opens=java.base/java.util.function=ALL-UNNAMED \
+  --wrapper_script_flag=--jvm_flag=-Dbazel.test_suite=com.google.android.apps.common.testing.suite.AndroidDeviceTestSuite \
+  --wrapper_script_flag=--jvm_flag=-Dargv="${argv}" \
+  ${argv}
diff --git a/android/instrumentation-testing/third_party/android-test/.bazelignore b/android/instrumentation-testing/third_party/android-test/.bazelignore
new file mode 100644
index 000000000..08047cf6e
--- /dev/null
+++ b/android/instrumentation-testing/third_party/android-test/.bazelignore
@@ -0,0 +1 @@
+overlay
diff --git a/android/instrumentation-testing/third_party/android-test/BUILD.bazel b/android/instrumentation-testing/third_party/android-test/BUILD.bazel
new file mode 100644
index 000000000..e69de29bb
diff --git a/android/instrumentation-testing/third_party/android-test/MODULE.bazel b/android/instrumentation-testing/third_party/android-test/MODULE.bazel
new file mode 100644
index 000000000..b790a07a0
--- /dev/null
+++ b/android/instrumentation-testing/third_party/android-test/MODULE.bazel
@@ -0,0 +1,108 @@
+module(
+    name = "android_test_overlay",
+    version = "0.0.0",
+)
+
+# These need to be consistent with their counterparts in build_extensions/axt_deps_versions.bzl.
+KOTLIN_VERSION = "1.9.21"
+
+KOTLINX_COROUTINES_VERSION = "1.8.1"
+
+bazel_dep(name = "protobuf", version = "29.3")
+bazel_dep(name = "rules_android", version = "0.7.2")
+bazel_dep(name = "rules_java", version = "9.6.1")
+bazel_dep(name = "rules_jvm_external", version = "7.0")
+bazel_dep(name = "rules_kotlin", version = "2.1.10", repo_name = "io_bazel_rules_kotlin")
+bazel_dep(name = "rules_license", version = "1.0.0")
+bazel_dep(name = "rules_python", version = "2.0.0")
+bazel_dep(name = "rules_robolectric", version = "4.14.1.2", repo_name = "robolectric")
+
+remote_android_extensions = use_extension("@rules_android//bzlmod_extensions:android_extensions.bzl", "remote_android_tools_extensions")
+use_repo(remote_android_extensions, "android_tools")
+
+android_sdk_repository_extension = use_extension("@rules_android//rules/android_sdk_repository:rule.bzl", "android_sdk_repository_extension")
+use_repo(android_sdk_repository_extension, "androidsdk")
+
+register_toolchains("@androidsdk//:sdk-toolchain", "@androidsdk//:all")
+
+python = use_extension("@rules_python//python/extensions:python.bzl", "python")
+python.toolchain(
+    ignore_root_user_error = True,
+    is_default = True,
+    python_version = "3.12",
+)
+
+maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
+maven.artifact(
+    artifact = "accessibility-test-framework",
+    exclusions = [
+        "org.checkerframework:checker",
+        "org.hamcrest:hamcrest-core",
+        "org.hamcrest:hamcrest-library",
+    ],
+    group = "com.google.android.apps.common.testing.accessibility.framework",
+    version = "3.1.2",
+)
+maven.install(
+    name = "android_test_maven",
+    aar_import_bzl_label = "@rules_android//android:rules.bzl",
+    artifacts = [
+        "aopalliance:aopalliance:1.0",
+        "androidx.annotation:annotation:1.7.0",
+        "androidx.concurrent:concurrent-futures:1.2.0",
+        "androidx.concurrent:concurrent-futures-ktx:1.2.0",
+        "androidx.core:core:1.6.0",
+        "androidx.lifecycle:lifecycle-common:2.3.1",
+        "androidx.tracing:tracing:1.1.0",
+        "androidx.window:window-core:1.1.0",
+        "androidx.window:window-java:1.1.0",
+        "com.beust:jcommander:1.82",
+        "com.google.auto.value:auto-value-annotations:1.11.0",
+        "com.google.auto.value:auto-value:1.11.0",
+        "com.google.code.findbugs:jsr305:3.0.2",
+        "com.google.dagger:dagger-compiler:2.46",
+        "com.google.dagger:dagger-producers:2.46",
+        "com.google.dagger:dagger:2.46",
+        "com.google.errorprone:error_prone_annotations:2.23.0",
+        "com.google.googlejavaformat:google-java-format:1.4",
+        "com.google.inject.extensions:guice-multibindings:4.2.3",
+        "com.google.inject:guice:4.2.3",
+        "com.squareup:javapoet:1.9.0",
+        "javax.annotation:javax.annotation-api:1.3.2",
+        "javax.inject:javax.inject:1",
+        "junit:junit:4.13.2",
+        "org.ccil.cowan.tagsoup:tagsoup:1.2.1",
+        "org.hamcrest:hamcrest-library:1.3",
+        "org.jetbrains.kotlin:kotlin-stdlib:%s" % KOTLIN_VERSION,
+        "org.jetbrains.kotlinx:kotlinx-coroutines-android:%s" % KOTLINX_COROUTINES_VERSION,
+        "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:%s" % KOTLINX_COROUTINES_VERSION,
+        "org.jetbrains.kotlinx:kotlinx-coroutines-core:%s" % KOTLINX_COROUTINES_VERSION,
+        "org.pantsbuild:jarjar:1.7.2",
+        "org.robolectric:robolectric:4.14.1",
+    ],
+    duplicate_version_warning = "none",
+    fail_if_repin_required = False,
+    fetch_sources = True,
+    repositories = [
+        "https://maven.google.com",
+        "https://repo1.maven.org/maven2",
+        "https://dl.bintray.com/linkedin/maven",
+    ],
+    use_starlark_android_rules = True,
+)
+use_repo(maven, maven = "android_test_maven")
+maven.install(
+    name = "maven_listenablefuture",
+    artifacts = [
+        "com.google.guava:listenablefuture:1.0",
+    ],
+    repositories = [
+        "https://maven.google.com",
+        "https://repo1.maven.org/maven2",
+        "https://dl.bintray.com/linkedin/maven",
+    ],
+)
+use_repo(maven, "maven_listenablefuture")
+
+android_test = use_extension("//:extensions.bzl", "android_test")
+use_repo(android_test, "android_test_support")
diff --git a/android/instrumentation-testing/third_party/android-test/extensions.bzl b/android/instrumentation-testing/third_party/android-test/extensions.bzl
new file mode 100644
index 000000000..738e0ac6b
--- /dev/null
+++ b/android/instrumentation-testing/third_party/android-test/extensions.bzl
@@ -0,0 +1,8 @@
+load(":repository.bzl", "android_test_repository")
+
+def _android_test_impl(_module_ctx):
+    android_test_repository(name = "android_test_support")
+
+android_test = module_extension(
+    implementation = _android_test_impl,
+)
diff --git a/android/instrumentation-testing/third_party/android-test/overlay/BUILD b/android/instrumentation-testing/third_party/android-test/overlay/BUILD
new file mode 100644
index 000000000..174c1941e
--- /dev/null
+++ b/android/instrumentation-testing/third_party/android-test/overlay/BUILD
@@ -0,0 +1,67 @@
+load("@io_bazel_rules_kotlin//kotlin:core.bzl", "define_kt_toolchain")
+load("@rules_java//java:defs.bzl", "java_test")
+load("@rules_jvm_external//:defs.bzl", "artifact")
+load("@rules_license//rules:license.bzl", "license")
+load("//build_extensions:axt_deps_versions.bzl", "KOTLIN_LANG_VERSION")
+load("//build_extensions/maven:maven_repo.bzl", "maven_repository")
+
+package(default_visibility = ["//:__subpackages__"])
+
+exports_files([
+    "proguard_binary.cfg",
+    "LICENSE",
+    "repo.bzl",
+])
+
+alias(
+    name = "junit",
+    actual = "@maven//:junit_junit",
+    visibility = ["//visibility:public"],
+)
+
+# Setup kotlin toolchain
+define_kt_toolchain(
+    name = "kotlin_toolchain",
+    api_version = KOTLIN_LANG_VERSION,
+    language_version = KOTLIN_LANG_VERSION,
+)
+
+# Creates maven release repository
+maven_repository(
+    name = "axt_m2repository",
+    testonly = 1,
+    srcs = [
+        "//core/java/androidx/test/core:core_maven_artifact",
+        "//espresso/accessibility/java/androidx/test/espresso/accessibility:accessibility_checks_maven_artifact",
+        "//espresso/contrib/java/androidx/test/espresso/contrib:espresso_contrib_maven_artifact",
+        "//espresso/core/java/androidx/test/espresso:espresso_core_maven_artifact",
+        "//espresso/device/java/androidx/test/espresso/device:device_maven_artifact",
+        "//espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent:idling_concurrent_maven_artifact",
+        "//espresso/idling_resource/java/androidx/test/espresso:espresso_idling_resource_maven_artifact",
+        "//espresso/idling_resource/net/java/androidx/test/espresso/idling/net:idling_net_maven_artifact",
+        "//espresso/intents/java/androidx/test/espresso/intent:espresso_intents_maven_artifact",
+        "//espresso/remote/java/androidx/test/espresso/remote:espresso_remote_maven_artifact",
+        "//espresso/web/java/androidx/test/espresso/web:espresso_web_maven_artifact",
+        "//ext/junit/java/androidx/test/ext/junit:junit_maven_artifact",
+        "//ext/truth/java/androidx/test/ext/truth:truth_maven_artifact",
+        "//ktx/core/java/androidx/test/core:core_maven_artifact",
+        "//ktx/ext/junit/java/androidx/test/ext/junit:junit_maven_artifact",
+        "//runner/android_junit_runner/java/androidx/test:runner_maven_artifact",
+        "//runner/android_test_orchestrator/stubapp:orchestrator_release_maven_artifact",
+        "//runner/monitor/java/androidx/test:monitor_maven_artifact",
+        "//runner/rules/java/androidx/test:rules_maven_artifact",
+        "//services:test_services_maven_artifact",
+        "//services/storage/java/androidx/test/services/storage:test_storage_maven_artifact",
+    ],
+)
+
+java_test(
+    name = "instrumentation_test_runner",
+    testonly = 1,
+    tags = ["manual"],
+    test_class = "com.google.android.apps.common.testing.suite.AndroidDeviceTestSuite",
+    visibility = ["//visibility:public"],
+    runtime_deps = ["//tools/device_broker/java/com/google/android/apps/common/testing/suite"],
+)
+
+license(name = "license")
diff --git a/android/instrumentation-testing/third_party/android-test/overlay/build_extensions/maven/axt_android_aar.bzl b/android/instrumentation-testing/third_party/android-test/overlay/build_extensions/maven/axt_android_aar.bzl
new file mode 100644
index 000000000..ccdb45867
--- /dev/null
+++ b/android/instrumentation-testing/third_party/android-test/overlay/build_extensions/maven/axt_android_aar.bzl
@@ -0,0 +1,129 @@
+"""Generate AXT android archive (aar)."""
+
+load("@rules_android//providers:providers.bzl", "AndroidLibraryAarInfo")
+load("@rules_java//java:defs.bzl", "JavaInfo", "java_common")
+load("//build_extensions/maven:add_or_update_file_in_zip.bzl", "add_or_update_file_in_zip")
+load("//build_extensions/maven:combine_jars.bzl", "combine_jars")
+load("//build_extensions/maven:jarjar.bzl", "jarjar_rule")
+load("//build_extensions/maven:maven_info.bzl", "MavenFilesInfo", "MavenInfo", "collect_maven_info")
+
+def _android_aar_impl(ctx):
+    # current_aar will include almost everything needed: an AndroidManifest.xml, compiled resources,
+    # and a proguard.txt. However, its classes.jar will only include direct compiled srcs. Missing
+    # will be any sources from transitive dependencies that also need to be bundled in the aar
+    current_aar = ctx.attr.included_dep[AndroidLibraryAarInfo].aar
+    if not current_aar:
+        fail("included_dep %s does not produce an aar. Is it an android_library rule with an AndroidManifest.xml?" % ctx.attr.included_dep.label)
+
+    if not ctx.attr.included_dep[MavenInfo].artifact:
+        fail("Could not find maven artifact for included_dep %s. Is it listed in maven_registry?" % ctx.attr.included_dep.label)
+
+    # build a combined classes jar from all dependencies that are part of this maven artifact
+    classes_jar = ctx.actions.declare_file(ctx.attr.name + "_combined_classes.jar")
+    combine_jars(
+        ctx = ctx,
+        input_jars_deps = ctx.attr.included_dep[MavenInfo].transitive_included_runtime_jars,
+        output = classes_jar,
+    )
+
+    # optionally use jarjar to rename shaded dependencies
+    if (ctx.attr.jarjar_rule):
+        jarjar_classes_jar = ctx.actions.declare_file(ctx.attr.name + "_jarjar_classes.jar")
+        jarjar_rule(ctx, rule = ctx.file.jarjar_rule, src = classes_jar, out = jarjar_classes_jar)
+        classes_jar = jarjar_classes_jar
+
+    # TODO: tying validation to an output was the only way to get this to run, but
+    # according to docs it shouldn't be necessary
+    #validation_output = ctx.actions.declare_file(ctx.attr.name + ".validation")
+    validation_output = ctx.outputs.validation
+    ctx.actions.run(
+        inputs = [classes_jar],
+        outputs = [validation_output],
+        mnemonic = "AxtAndroidAarValidateJar",
+        executable = ctx.executable._validate_jar_java,
+        arguments = [validation_output.path, classes_jar.path] + ctx.attr.expected_class_prefixes,
+    )
+    _validate_maven_deps(sorted(ctx.attr.included_dep[MavenInfo].transitive_maven_direct_deps.to_list()), ctx.attr.banned_maven_deps)
+
+    # update the aar with the new classes.jar
+    add_or_update_file_in_zip(
+        ctx,
+        ctx.attr.name + "_classes",
+        src = current_aar,
+        out = ctx.outputs.aar,
+        update_src = classes_jar,
+        update_path = "classes.jar",
+    )
+
+    # produce src jar
+    combine_jars(
+        ctx = ctx,
+        input_jars_deps = ctx.attr.included_dep[MavenInfo].transitive_included_src_jars,
+        output = ctx.outputs.src_jar,
+    )
+
+    return [
+        ctx.attr.included_dep[MavenInfo],
+        MavenFilesInfo(runtime = ctx.outputs.aar, src_jar = ctx.outputs.src_jar, validation = validation_output),
+        OutputGroupInfo(_validation = depset([validation_output])),
+    ]
+
+def _validate_maven_deps(maven_deps, banned_dep_patterns):
+    for banned_dep_pattern in banned_dep_patterns:
+        for dep in maven_deps:
+            if banned_dep_pattern in dep:
+                fail("%s is not an allowed dependency" % dep)
+
+axt_android_aar = rule(
+    implementation = _android_aar_impl,
+    attrs = {
+        "included_dep": attr.label(
+            doc = "The android_library target to use as a basis for the android archive. " +
+                  "This must include an AndroidManifest.xml, and optionally resources, proguard_specs",
+            mandatory = True,
+            providers = [JavaInfo, AndroidLibraryAarInfo],
+            aspects = [collect_maven_info],
+        ),
+        "expected_class_prefixes": attr.string_list(
+            doc = "The list of class prefixes expected to be containing in resulting .aar. All classes in aar must match at least one of the given prefixes.",
+            mandatory = True,
+        ),
+        "jarjar_rule": attr.label(
+            doc = "Optional file containing jarjar rules to be applied to the classes.",
+            mandatory = False,
+            allow_single_file = [".txt"],
+        ),
+        "banned_maven_deps": attr.string_list(
+            doc = ("List of strings that specify the set of disallowed maven dependencies. The " +
+                   "rule will fail if any maven dependency contains one or more of these strings."),
+            default = ["com.google.guava:guava", "com.google.dagger"],
+        ),
+        "_jdk": attr.label(
+            default = Label("@bazel_tools//tools/jdk"),
+            providers = [java_common.JavaRuntimeInfo],
+        ),
+        "_combine_jars_java": attr.label(
+            executable = True,
+            cfg = "exec",
+            allow_files = True,
+            default = Label("//build_extensions/jar_combiner/java/androidx/test/tools/jarcombiner"),
+        ),
+        "_validate_jar_java": attr.label(
+            executable = True,
+            cfg = "exec",
+            allow_files = True,
+            default = Label("//build_extensions/jar_validator/java/androidx/test/tools/jarvalidator"),
+        ),
+        "_jarjar": attr.label(
+            default = Label("//build_extensions/maven:jarjar_bin"),
+            executable = True,
+            cfg = "exec",
+        ),
+    },
+    outputs = {
+        "aar": "%{name}.aar",
+        "src_jar": "%{name}-src.jar",
+        # TODO: remove, this shouldn't be necessary
+        "validation": "%{name}.validation",
+    },
+)
diff --git a/android/instrumentation-testing/third_party/android-test/overlay/build_extensions/maven/axt_maven_apk.bzl b/android/instrumentation-testing/third_party/android-test/overlay/build_extensions/maven/axt_maven_apk.bzl
new file mode 100644
index 000000000..b91f24fae
--- /dev/null
+++ b/android/instrumentation-testing/third_party/android-test/overlay/build_extensions/maven/axt_maven_apk.bzl
@@ -0,0 +1,40 @@
+"""Generate AXT android archive (aar)."""
+
+load("@rules_android//providers:providers.bzl", "ApkInfo")
+load("@rules_java//java:defs.bzl", "JavaInfo")
+load("//build_extensions/maven:combine_jars.bzl", "combine_jars")
+load("//build_extensions/maven:maven_info.bzl", "MavenFilesInfo", "MavenInfo", "collect_maven_apk_info")
+
+def _axt_maven_apk_impl(ctx):
+    # produce src jar
+    combine_jars(
+        ctx = ctx,
+        input_jars_deps = ctx.attr.included_dep[MavenInfo].transitive_included_src_jars,
+        output = ctx.outputs.src_jar,
+    )
+
+    return [
+        ctx.attr.included_dep[MavenInfo],
+        MavenFilesInfo(runtime = ctx.attr.included_dep[ApkInfo].signed_apk, src_jar = ctx.outputs.src_jar, validation = None),
+    ]
+
+axt_maven_apk = rule(
+    implementation = _axt_maven_apk_impl,
+    attrs = {
+        "included_dep": attr.label(
+            doc = "The android_binary to publish",
+            mandatory = True,
+            providers = [JavaInfo, ApkInfo],
+            aspects = [collect_maven_apk_info],
+        ),
+        "_combine_jars_java": attr.label(
+            executable = True,
+            cfg = "exec",
+            allow_files = True,
+            default = Label("//build_extensions/jar_combiner/java/androidx/test/tools/jarcombiner"),
+        ),
+    },
+    outputs = {
+        "src_jar": "%{name}-src.jar",
+    },
+)
diff --git a/android/instrumentation-testing/third_party/android-test/overlay/build_extensions/maven/maven_info.bzl b/android/instrumentation-testing/third_party/android-test/overlay/build_extensions/maven/maven_info.bzl
new file mode 100644
index 000000000..38684a37b
--- /dev/null
+++ b/android/instrumentation-testing/third_party/android-test/overlay/build_extensions/maven/maven_info.bzl
@@ -0,0 +1,211 @@
+# Copyright 2023 The Android Open Source Project. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+"""Starlark rules to collect Maven artifacts information.
+"""
+
+load("@protobuf//bazel/common:proto_info.bzl", "ProtoInfo")
+load("@rules_java//java:defs.bzl", "JavaInfo")
+load("//build_extensions:axt_deps_versions.bzl", "KOTLIN_VERSION")
+load("//build_extensions/maven:kotlin_info.bzl", "is_kotlin")
+load("//build_extensions/maven:maven_registry.bzl", "get_artifact_from_label", "get_maven_apk_deps", "is_axt_label", "is_shaded_from_label")
+
+# logic here largely inspired from https://github.com/google/dagger/blob/master/tools/maven_info.bzl
+
+# provider for the built maven files to be published
+MavenFilesInfo = provider(
+    fields = {
+        "runtime": """
+        The runtime artifact. Either a .jar, .aar or .apk
+        """,
+        "src_jar": """
+        The jar of source files
+        """,
+        "validation": """
+        The validation output file
+        """,
+    },
+)
+
+# provider for info on building the maven artifacts and its related dependency info
+MavenInfo = provider(
+    fields = {
+        "artifact": """
+        The Maven coordinate for the artifact that is exported by this target. Can only be null if is_compileonly or is_shaded are True.
+        """,
+        "is_compileOnly": """
+        True if this target is a compile only dependency, and should not be included in final combined artifact.
+        """,
+        "is_shaded": """
+        True if this is a shaded dependency and it should be directly bundled inside the final artifact.
+        """,
+        "transitive_included_runtime_jars": """
+        depset of jars to bundle into same artifact.
+        """,
+        "transitive_included_src_jars": """
+        depset of src jars to bundle into same artifact.
+        """,
+        "transitive_maven_direct_deps": """
+        depset of external maven artifacts that are a direct dependency of this artifact.
+        """,
+    },
+)
+
+MAVEN_COORDINATES_PREFIX = "maven_coordinates="
+
+def _collect_maven_info_impl(target, ctx):
+    tags = getattr(ctx.rule.attr, "tags", [])
+    neverlink = getattr(ctx.rule.attr, "neverlink", False)
+    deps = getattr(ctx.rule.attr, "deps", [])
+    exports = getattr(ctx.rule.attr, "exports", [])
+
+    # ignore non-runtime or non-java dependencies eg proto_library
+    if neverlink or JavaInfo not in target:
+        return MavenInfo(
+            artifact = None,
+            is_compileOnly = True,
+            is_shaded = False,
+            transitive_included_runtime_jars = depset(),
+            transitive_included_src_jars = depset(),
+            transitive_maven_direct_deps = depset(),
+        )
+
+    artifact = get_artifact_from_label(target.label)
+    is_shaded = is_shaded_from_label(target.label)
+
+    if not artifact and not is_shaded:
+        for tag in tags:
+            if tag.startswith(MAVEN_COORDINATES_PREFIX):
+                if artifact:
+                    fail("%s: Each target must belong to one and only one maven artifact: Does target have multiple '%s' tags?" % (target.label, MAVEN_COORDINATES_PREFIX))
+                artifact = tag[len(MAVEN_COORDINATES_PREFIX):]
+
+    included_runtime_jars = []
+    included_runtime_jars += target[JavaInfo].runtime_output_jars
+
+    # shaded source won't be correct, so just exclude it
+    included_src_jars = [] if is_shaded else target[JavaInfo].source_jars
+    transitive_included_runtime_jars = []
+    transitive_included_src_jars = []
+    maven_direct_deps = []
+    transitive_maven_direct_deps = []
+
+    # add implicit runtime dependencies needed by certain rules
+    if is_kotlin(target):
+        maven_direct_deps.append("org.jetbrains.kotlin:kotlin-stdlib:%s" % KOTLIN_VERSION)
+
+    grpc_protobuf_jar = _findGrpcJavaProtoJar(target)
+    if grpc_protobuf_jar:
+        # java_grpc_library rule's generated code implicitly depends on this artifact
+        # which needs to be shaded
+        included_runtime_jars.append(grpc_protobuf_jar)
+
+    # this is a bit of a hack, but java_lite_proto_library have empty runtime_output_jars!
+    # So add in all transitive_runtime_jars instead, because we know for protos all dependencies must
+    # be embedded in resulting aar
+    if _isJavaProtoTarget((deps + exports)):
+        included_runtime_jars = target[JavaInfo].transitive_runtime_jars.to_list()
+
+    for dep in (deps + exports):
+        if is_shaded:
+            transitive_included_runtime_jars.append(dep[MavenInfo].transitive_included_runtime_jars)
+        if dep[MavenInfo].artifact == artifact:
+            transitive_included_runtime_jars.append(dep[MavenInfo].transitive_included_runtime_jars)
+            transitive_included_src_jars.append(dep[MavenInfo].transitive_included_src_jars)
+
+            # also need to pick up any external maven deps from this included dep
+            transitive_maven_direct_deps.append(dep[MavenInfo].transitive_maven_direct_deps)
+        elif dep[MavenInfo].is_shaded:
+            transitive_included_runtime_jars.append(dep[MavenInfo].transitive_included_runtime_jars)
+        elif dep[MavenInfo].artifact:
+            # this dependency is an external maven artifact, just need to add it to direct deps
+            maven_direct_deps.append(dep[MavenInfo].artifact)
+        elif not dep[MavenInfo].is_compileOnly and not dep[MavenInfo].is_shaded:
+            fail("%s: Each target must belong to one and only one maven artifact: Did not find maven info for dep %s" % (target.label, dep.label))
+
+    return [MavenInfo(
+        artifact = artifact,
+        is_compileOnly = False,
+        is_shaded = is_shaded,
+        transitive_included_runtime_jars = depset(included_runtime_jars, transitive = transitive_included_runtime_jars),
+        transitive_included_src_jars = depset(included_src_jars, transitive = transitive_included_src_jars),
+        transitive_maven_direct_deps = depset(maven_direct_deps, transitive = transitive_maven_direct_deps),
+    )]
+
+def _isJavaProtoTarget(all_deps):
+    for dep in all_deps:
+        if ProtoInfo in dep:
+            return True
+    return False
+
+def _findGrpcJavaProtoJar(target):
+    for jar in target[JavaInfo].transitive_runtime_jars.to_list():
+        if "grpc-java/protobuf-lite" in jar.path:
+            return jar
+    return None
+
+collect_maven_info = aspect(
+    attr_aspects = [
+        "deps",
+        "exports",
+    ],
+    doc = """
+    Collects the Maven information for targets, their dependencies, and their transitive exports.
+    """,
+    implementation = _collect_maven_info_impl,
+)
+
+def _collect_maven_apk_info_impl(target, ctx):
+    neverlink = getattr(ctx.rule.attr, "neverlink", False)
+    deps = getattr(ctx.rule.attr, "deps", [])
+    exports = getattr(ctx.rule.attr, "exports", [])
+
+    # ignore non-runtime or non-java dependencies eg proto_library or non-axt-labels
+    if neverlink or JavaInfo not in target or not is_axt_label(target.label):
+        return MavenInfo(
+            artifact = None,
+            is_compileOnly = True,
+            is_shaded = False,
+            transitive_included_runtime_jars = depset(),
+            transitive_included_src_jars = depset(),
+            transitive_maven_direct_deps = depset(),
+        )
+
+    artifact = get_artifact_from_label(target.label)
+    included_src_jars = target[JavaInfo].source_jars
+    transitive_included_src_jars = []
+
+    for dep in (deps + exports):
+        transitive_included_src_jars.append(dep[MavenInfo].transitive_included_src_jars)
+
+    maven_deps = get_maven_apk_deps(artifact)
+    return [MavenInfo(
+        artifact = artifact,
+        is_compileOnly = False,
+        is_shaded = False,
+        transitive_included_runtime_jars = depset(),
+        transitive_included_src_jars = depset(included_src_jars, transitive = transitive_included_src_jars),
+        transitive_maven_direct_deps = depset(maven_deps),
+    )]
+
+collect_maven_apk_info = aspect(
+    attr_aspects = [
+        "deps",
+        "exports",
+    ],
+    doc = """
+    Collects the Maven apk information for targets, their dependencies, and their transitive exports.
+    """,
+    implementation = _collect_maven_apk_info_impl,
+)
diff --git a/android/instrumentation-testing/third_party/android-test/overlay/opensource/BUILD b/android/instrumentation-testing/third_party/android-test/overlay/opensource/BUILD
new file mode 100644
index 000000000..f3929918e
--- /dev/null
+++ b/android/instrumentation-testing/third_party/android-test/overlay/opensource/BUILD
@@ -0,0 +1,33 @@
+load("@rules_android//android:rules.bzl", "android_library")
+load("@rules_java//java:defs.bzl", "java_import", "java_library", "java_plugin")
+
+# aliases that creates bazel targets that are equivalent to blaze
+
+java_import(
+    name = "androidsdk_compiletime",
+    jars = [
+        "@androidsdk//:platforms/android-36/android.jar",
+    ],
+    neverlink = 1,
+    visibility = [
+        "//visibility:public",
+    ],
+)
+
+java_library(
+    name = "auto_value",
+    exported_plugins = [":auto_value_plugin"],
+    visibility = ["//visibility:public"],
+    exports = [
+        "@maven//:com_google_auto_value_auto_value_annotations",
+    ],
+)
+
+java_plugin(
+    name = "auto_value_plugin",
+    generates_api = True,
+    processor_class = "com.google.auto.value.processor.AutoValueProcessor",
+    deps = [
+        "@maven//:com_google_auto_value_auto_value",
+    ],
+)
diff --git a/android/instrumentation-testing/third_party/android-test/overlay/opensource/androidx/BUILD b/android/instrumentation-testing/third_party/android-test/overlay/opensource/androidx/BUILD
new file mode 100644
index 000000000..e509e79b7
--- /dev/null
+++ b/android/instrumentation-testing/third_party/android-test/overlay/opensource/androidx/BUILD
@@ -0,0 +1,29 @@
+# Targets to handle androidx dependencies in bazel
+
+load("@rules_java//java:defs.bzl", "java_library")
+load(
+    "//build_extensions:axt_deps_versions.bzl",
+    "ANDROIDX_ANNOTATION_VERSION",
+)
+
+package(default_visibility = ["//visibility:public"])
+
+# Alias target for androidx.annotation
+# Ideally libraries could directly depend on the @maven targets instead, but:
+# 1. Directly depending on annotation doesn't work since it contains no classes,
+# and results in 'error: [strict] Using type androidx.annotation.RestrictTo
+# from an indirect dependency (TOOL_INFO:
+# "@maven//:androidx_annotation_annotation_jvm").'
+# 2. Directly depending on annotation-jvm doesn't work since that can result in
+# duplicate class errors when transitive dependencies depend on older versions
+# of androidx.annotation
+java_library(
+    name = "annotation",
+    tags = [
+        "maven_coordinates=androidx.annotation:annotation:" + ANDROIDX_ANNOTATION_VERSION,
+    ],
+    exports = [
+        "@maven//:androidx_annotation_annotation",
+        "@maven//:androidx_annotation_annotation_jvm",
+    ],
+)
diff --git a/android/instrumentation-testing/third_party/android-test/overlay/opensource/auto_value/BUILD b/android/instrumentation-testing/third_party/android-test/overlay/opensource/auto_value/BUILD
new file mode 100644
index 000000000..0eafef2c2
--- /dev/null
+++ b/android/instrumentation-testing/third_party/android-test/overlay/opensource/auto_value/BUILD
@@ -0,0 +1,19 @@
+load("@rules_java//java:defs.bzl", "java_library", "java_plugin")
+
+java_library(
+    name = "auto_value",
+    exported_plugins = [":auto_value_plugin"],
+    visibility = ["//visibility:public"],
+    exports = [
+        "@maven//:com_google_auto_value_auto_value_annotations",
+    ],
+)
+
+java_plugin(
+    name = "auto_value_plugin",
+    generates_api = True,
+    processor_class = "com.google.auto.value.processor.AutoValueProcessor",
+    deps = [
+        "@maven//:com_google_auto_value_auto_value",
+    ],
+)
diff --git a/android/instrumentation-testing/third_party/android-test/overlay/opensource/dagger/BUILD b/android/instrumentation-testing/third_party/android-test/overlay/opensource/dagger/BUILD
new file mode 100644
index 000000000..debf8e70a
--- /dev/null
+++ b/android/instrumentation-testing/third_party/android-test/overlay/opensource/dagger/BUILD
@@ -0,0 +1,30 @@
+# Essential dagger libraries for AXT in Bazel
+
+load("@rules_java//java:defs.bzl", "java_library", "java_plugin")
+
+package(default_visibility = ["//visibility:public"])
+
+java_library(
+    name = "dagger",
+    exported_plugins = [":dagger_plugin"],
+    exports = [
+        "@maven//:com_google_dagger_dagger",
+    ],
+)
+
+java_plugin(
+    name = "dagger_plugin",
+    generates_api = 1,
+    processor_class = "dagger.internal.codegen.ComponentProcessor",
+    deps = [
+        "@maven//:com_google_dagger_dagger",
+        "@maven//:com_google_dagger_dagger_compiler",
+        "@maven//:com_google_dagger_dagger_producers",
+        "@maven//:com_google_errorprone_javac_shaded",
+        "@maven//:com_google_googlejavaformat_google_java_format",
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_squareup_javapoet",
+        "@maven//:javax_annotation_javax_annotation_api",
+        "@maven//:javax_inject_javax_inject",
+    ],
+)
diff --git a/android/instrumentation-testing/third_party/android-test/overlay/runner/android_junit_runner/java/androidx/test/BUILD b/android/instrumentation-testing/third_party/android-test/overlay/runner/android_junit_runner/java/androidx/test/BUILD
new file mode 100644
index 000000000..1dee74eb9
--- /dev/null
+++ b/android/instrumentation-testing/third_party/android-test/overlay/runner/android_junit_runner/java/androidx/test/BUILD
@@ -0,0 +1,98 @@
+# Description: Build rules for building androidx.test from source
+
+load("@rules_android//android:rules.bzl", "android_library")
+load("@rules_java//java:defs.bzl", "java_library")
+load("//build_extensions:api_checks.bzl", "api_checks")
+load("//build_extensions:dackka_test.bzl", "dackka_test")
+load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar")
+load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact")
+
+# all users should reference the equivalent targets in //runner/android_junit_runner
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+    default_visibility = [
+        ":allowlist",
+    ],
+)
+
+package_group(
+    name = "allowlist",
+    packages = [
+        "//...",
+    ],
+)
+
+licenses(["notice"])
+
+android_library(
+    name = "runner",
+    srcs = glob(
+        include = ["**/*.java"],
+        exclude = ["filters/*.java"],
+    ),
+    custom_package = "androidx.test.runner",
+    idl_srcs = glob(["**/*.aidl"]),
+    manifest = "AndroidManifest.xml",
+    proguard_specs = [
+        "proguard_library.cfg",
+    ],
+    exports = [
+        ":filters",
+        "//runner/monitor",
+    ],
+    deps = [
+        ":filters",
+        "//opensource/androidx:annotation",
+        "//runner/monitor",
+        "//services/events/java/androidx/test/services/events",
+        "//services/storage",
+        "@androidsdk//:legacy_test-36",
+        "@maven//:androidx_tracing_tracing",
+        "@maven//:junit_junit",
+    ],
+)
+
+java_library(
+    name = "filters",
+    srcs = glob(["filters/*.java"]),
+    visibility = [
+        "//visibility:public",
+    ],
+    deps = [
+        "//opensource:androidsdk_compiletime",
+        "//opensource/androidx:annotation",
+        "@maven//:junit_junit",
+    ],
+)
+
+# Generate rules for the release artifacts.
+axt_android_aar(
+    name = "runner_aar",
+    expected_class_prefixes = [
+        "androidx.test.services.events",
+        "androidx.test.runner",
+        "androidx.test.orchestrator",
+        "androidx.test.internal",
+        "androidx.test.filters",
+    ],
+    included_dep = ":runner",
+)
+
+maven_artifact(
+    name = "runner_maven_artifact",
+    last_updated = "20170622000000",
+    target = ":runner_aar",
+)
+
+dackka_test(
+    name = "runner_doc",
+    runtime_dep = ":runner",
+    src_jar = ":runner_aar-src.jar",
+)
+
+api_checks(
+    name = "runner_api",
+    runtime_dep = ":runner",
+    src_jar = ":runner_aar-src.jar",
+)
diff --git a/android/instrumentation-testing/third_party/android-test/overlay/runner/android_test_orchestrator/java/androidx/test/orchestrator/BUILD b/android/instrumentation-testing/third_party/android-test/overlay/runner/android_test_orchestrator/java/androidx/test/orchestrator/BUILD
new file mode 100644
index 000000000..b27257b4b
--- /dev/null
+++ b/android/instrumentation-testing/third_party/android-test/overlay/runner/android_test_orchestrator/java/androidx/test/orchestrator/BUILD
@@ -0,0 +1,46 @@
+# Description:
+#   On Device Orchestrator, to run instrumentation tests sequentially from a single adb command
+
+load("@rules_android//android:rules.bzl", "android_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+    default_visibility = ["//:__subpackages__"],
+)
+
+android_library(
+    name = "orchestrator",
+    srcs = glob(["**/*java"]),
+    idl_srcs = glob(
+        ["**/*.aidl"],
+        allow_empty = True,
+    ),
+    visibility = [
+        ":export",
+    ],
+    deps = [
+        "//opensource/androidx:annotation",
+        "//runner/android_junit_runner",
+        "//services/shellexecutor:exec_client",
+        "@maven//:androidx_core_core",
+    ],
+)
+
+# Do not link to these targets directly, rely on exporting target instead
+package_group(
+    name = "export",
+    packages = [
+        "//runner/android_test_orchestrator",
+        "//runner/android_test_orchestrator/stubapp",
+    ],
+)
+
+filegroup(
+    name = "orchestrator_src",
+    srcs = [
+        ":liborchestrator-src.jar",
+    ],
+)
diff --git a/android/instrumentation-testing/third_party/android-test/overlay/runner/android_test_orchestrator/stubapp/BUILD b/android/instrumentation-testing/third_party/android-test/overlay/runner/android_test_orchestrator/stubapp/BUILD
new file mode 100644
index 000000000..815f69c6a
--- /dev/null
+++ b/android/instrumentation-testing/third_party/android-test/overlay/runner/android_test_orchestrator/stubapp/BUILD
@@ -0,0 +1,44 @@
+load("@rules_android//android:rules.bzl", "android_binary")
+load("//build_extensions:axt_versions.bzl", "ORCHESTRATOR_VERSION")
+load("//build_extensions/maven:axt_maven_apk.bzl", "axt_maven_apk")
+load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+    default_visibility = ["//:__subpackages__"],
+)
+
+# Dummy app to allow the On Device Orchestration to run and execute.
+android_binary(
+    name = "stubapp",
+    srcs = ["src/androidx/test/orchestrator/Orchestrator.java"],
+    custom_package = "androidx.test.orchestrator.stubapp",
+    manifest = "src/AndroidManifest.xml",
+    manifest_values = {
+        "appVersion": ORCHESTRATOR_VERSION,
+    },
+    proguard_specs = [
+        "//:proguard_binary.cfg",
+        "proguard_binary.cfg",
+    ],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//runner/android_junit_runner",
+        "//runner/android_test_orchestrator",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_maven_apk(
+    name = "orchestrator_release_apk",
+    included_dep = ":stubapp",
+)
+
+maven_artifact(
+    name = "orchestrator_release_maven_artifact",
+    last_updated = "20170622000000",
+    target = ":orchestrator_release_apk",
+)
diff --git a/android/instrumentation-testing/third_party/android-test/overlay/runner/monitor/java/androidx/test/BUILD b/android/instrumentation-testing/third_party/android-test/overlay/runner/monitor/java/androidx/test/BUILD
new file mode 100644
index 000000000..12618a758
--- /dev/null
+++ b/android/instrumentation-testing/third_party/android-test/overlay/runner/monitor/java/androidx/test/BUILD
@@ -0,0 +1,136 @@
+# Description: Build rules for building androidx.test from source
+
+load("@rules_android//android:rules.bzl", "android_library")
+load("@rules_java//java:defs.bzl", "java_library")
+load("//build_extensions:api_checks.bzl", "api_checks")
+load("//build_extensions:dackka_test.bzl", "dackka_test")
+load("//build_extensions:kt_android_library.bzl", "kt_android_library")
+load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar")
+load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact")
+
+# nearly all users should reference the equivalent target in //runner/monitor
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+    default_visibility = [
+        ":allowlist",
+    ],
+)
+
+package_group(
+    name = "allowlist",
+    packages = [
+        "//...",
+    ],
+)
+
+licenses(["notice"])
+
+kt_android_library(
+    name = "monitor",
+    srcs = glob(
+        [
+            "**/*.java",
+            "**/*.kt",
+        ],
+        exclude = [
+            "internal/runner/runtime/ExposedInstrumentationApi.java",
+            "internal/runner/hidden/ExposedInstrumentationApi.java",
+            "internal/platform/app/ActivityInvoker$$CC.java",
+            "internal/platform/app/ActivityInvokerDesugar.java",
+        ],
+    ),
+    tags = ["alt_dep=//runner/monitor"],
+    deps = [
+        ":compiletime_hidden_apis",
+        ":errorprone_neverlink",
+        ":runtime_hidden_apis",
+        "//opensource/androidx:annotation",
+        "@maven//:androidx_tracing_tracing",
+    ],
+)
+
+# avoid the runtime dependency on errorprone
+java_library(
+    name = "errorprone_neverlink",
+    neverlink = 1,
+    exports = [
+        "@maven//:com_google_errorprone_error_prone_annotations",
+    ],
+)
+
+android_library(
+    name = "runtime_hidden_apis",
+    srcs = [
+        "internal/runner/runtime/ExposedInstrumentationApi.java",
+    ],
+    deps = ["//opensource/androidx:annotation"],
+)
+
+android_library(
+    name = "compiletime_hidden_apis",
+    srcs = [
+        "internal/runner/hidden/ExposedInstrumentationApi.java",
+    ],
+    neverlink = 1,
+    deps = [
+        "//opensource/androidx:annotation",
+    ],
+)
+
+# group of targets to use to produce release binary + docs
+android_library(
+    name = "monitor_release_lib",
+    srcs = [
+        # only needed for external release backwards compatibility
+        "internal/platform/app/ActivityInvoker$$CC.java",
+        "internal/platform/app/ActivityInvokerDesugar.java",
+    ],
+    custom_package = "androidx.test.monitor",
+    manifest = "AndroidManifest.xml",
+    proguard_specs = [":proguard_library.cfg"],
+    visibility = ["//visibility:private"],
+    exports = [
+        ":monitor",
+    ],
+    deps = [
+        ":monitor",
+        "//opensource/androidx:annotation",
+    ],
+)
+
+axt_android_aar(
+    name = "monitor_aar",
+    # Unfortunately this legacy artifact doesn't follow standard class naming conventions.
+    # so we'll be more explicit in the expected packages list to catch new classes that don't follow
+    # expected package patterns
+    expected_class_prefixes = [
+        "androidx.test.InstrumentationRegistry",
+        "androidx.test.annotation.Beta",
+        "androidx.test.internal",
+        "androidx.test.platform",
+        "androidx.test.runner",
+    ],
+    included_dep = ":monitor_release_lib",
+    jarjar_rule = ":jarjar.txt",
+)
+
+maven_artifact(
+    name = "monitor_maven_artifact",
+    last_updated = "20170622000000",
+    target = ":monitor_aar",
+)
+
+dackka_test(
+    name = "monitor_doc",
+    runtime_dep = ":monitor_release_lib",
+    src_jar = ":libmonitor-src.jar",
+)
+
+api_checks(
+    name = "monitor_api",
+    runtime_dep = ":monitor_release_lib",
+    # ideally we would use monitor_aar-src.jar here, but metalava complains
+    # about ExposedInstrumentationApi's package
+    src_jar = ":libmonitor-src.jar",
+)
diff --git a/android/instrumentation-testing/third_party/android-test/overlay/services/BUILD b/android/instrumentation-testing/third_party/android-test/overlay/services/BUILD
new file mode 100644
index 000000000..9f84e10d2
--- /dev/null
+++ b/android/instrumentation-testing/third_party/android-test/overlay/services/BUILD
@@ -0,0 +1,57 @@
+load("@rules_android//android:rules.bzl", "android_binary")
+load("@rules_license//rules:license.bzl", "license")
+load("//build_extensions:axt_versions.bzl", "SERVICES_VERSION")
+load("//build_extensions/maven:axt_maven_apk.bzl", "axt_maven_apk")
+load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact")
+
+# Description:
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = [":license"],
+    default_testonly = 1,
+    default_visibility = [
+        "//:__subpackages__",
+    ],
+)
+
+license(
+    name = "license",
+)
+
+exports_files(["LICENSE"])
+
+# Standard test services that can be installed on any device.
+android_binary(
+    name = "test_services",
+    custom_package = "androidx.test.services",
+    manifest = "AndroidManifest.xml",
+    manifest_values = {
+        "appVersion": SERVICES_VERSION,
+    },
+    proguard_specs = [
+        "//:proguard_binary.cfg",
+        "proguard_library.cfg",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+    deps = [
+        "//services/shellexecutor:exec_server",
+        "//services/speakeasy/java/androidx/test/services/speakeasy:protocol",
+        "//services/speakeasy/java/androidx/test/services/speakeasy/server",
+        "//services/storage/java/androidx/test/services/storage/provider:storage_content_providers",
+    ],
+)
+
+axt_maven_apk(
+    name = "test_services_release_apk",
+    included_dep = ":test_services",
+)
+
+maven_artifact(
+    name = "test_services_maven_artifact",
+    last_updated = "20191210000000",
+    target = ":test_services_release_apk",
+)
diff --git a/android/instrumentation-testing/third_party/android-test/overlay/services/events/java/androidx/test/services/events/BUILD b/android/instrumentation-testing/third_party/android-test/overlay/services/events/java/androidx/test/services/events/BUILD
new file mode 100644
index 000000000..1373eb85a
--- /dev/null
+++ b/android/instrumentation-testing/third_party/android-test/overlay/services/events/java/androidx/test/services/events/BUILD
@@ -0,0 +1,31 @@
+load("@rules_android//android:rules.bzl", "android_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//services:license"],
+    default_testonly = 1,
+    default_visibility = [
+        "//:__subpackages__",
+    ],
+)
+
+android_library(
+    name = "events",
+    srcs = glob(["**/*.java"]),
+    idl_parcelables = [
+        "discovery/TestDiscoveryEvent.aidl",
+        "platform/TestPlatformEvent.aidl",
+        "run/TestRunEvent.aidl",
+    ],
+    idl_srcs = [
+        "discovery/ITestDiscoveryEvent.aidl",
+        "platform/ITestPlatformEvent.aidl",
+        "run/ITestRunEvent.aidl",
+    ],
+    deps = [
+        "//opensource/androidx:annotation",
+        "//runner/monitor",
+        "@maven//:junit_junit",
+    ],
+)
diff --git a/android/instrumentation-testing/third_party/android-test/overlay/services/proguard_library.cfg b/android/instrumentation-testing/third_party/android-test/overlay/services/proguard_library.cfg
new file mode 100644
index 000000000..6e5d6645e
--- /dev/null
+++ b/android/instrumentation-testing/third_party/android-test/overlay/services/proguard_library.cfg
@@ -0,0 +1,55 @@
+
+# ShellMain is main access point, must not be obfuscated
+-keep class androidx.test.services.shellexecutor.** { *; }
+
+# Brought in via res/layout/ xml.
+# Safe to remove, depends on framework depending on version.
+-dontwarn android.support.**
+-dontwarn android.app.ActivityManagerNative
+-dontwarn android.app.IActivityManager
+
+-dontwarn java.lang.instrument.**
+-dontwarn java.lang.management.**
+-dontwarn javax.management.**
+
+# Ignore missing Kotlin meta-annotations so that Java-only projects can depend
+# on projects that happen to be written in Kotlin but do not have a run-time
+# dependency on the Kotlin standard library. Note these annotations are RUNTIME
+# retention, but we won't need them available in Java-only projects.
+-dontwarn kotlin.Metadata
+-dontwarn kotlin.annotation.AnnotationRetention
+-dontwarn kotlin.annotation.AnnotationTarget
+-dontwarn kotlin.annotation.Retention
+-dontwarn kotlin.annotation.Target
+-dontwarn kotlin.Deprecated
+-dontwarn kotlin.ReplaceWith
+
+# ServiceLoader support
+-keepnames class kotlinx.coroutines.internal.MainDispatcherFactory {}
+-keepnames class kotlinx.coroutines.CoroutineExceptionHandler {}
+
+# Most of volatile fields are updated with AFU and should not be mangled
+-keepclassmembers class kotlinx.coroutines.** {
+    volatile <fields>;
+}
+
+# Same story for the standard library's SafeContinuation that also uses AtomicReferenceFieldUpdater
+-keepclassmembers class kotlin.coroutines.SafeContinuation {
+    volatile <fields>;
+}
+
+# These classes are only required by kotlinx.coroutines.debug.AgentPremain, which is only loaded when
+# kotlinx-coroutines-core is used as a Java agent, so these are not needed in contexts where ProGuard is used.
+-dontwarn java.lang.instrument.ClassFileTransformer
+-dontwarn sun.misc.SignalHandler
+-dontwarn java.lang.instrument.Instrumentation
+-dontwarn sun.misc.Signal
+
+# Only used in `kotlinx.coroutines.internal.ExceptionsConstructor`.
+# The case when it is not available is hidden in a `try`-`catch`, as well as a check for Android.
+-dontwarn java.lang.ClassValue
+
+# An annotation used for build tooling, won't be directly accessed.
+-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
+
+-dontwarn kotlinx.coroutines.internal.ClassValueCtorCache
diff --git a/android/instrumentation-testing/third_party/android-test/overlay/services/shellexecutor/BUILD b/android/instrumentation-testing/third_party/android-test/overlay/services/shellexecutor/BUILD
new file mode 100644
index 000000000..73d46152a
--- /dev/null
+++ b/android/instrumentation-testing/third_party/android-test/overlay/services/shellexecutor/BUILD
@@ -0,0 +1,31 @@
+# A shell command execution server to allow shell commands to be run at elevated permissions
+
+load("@rules_android//android:rules.bzl", "android_library")
+
+package(
+    default_applicable_licenses = ["//services:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+android_library(
+    name = "exec_server",
+    visibility = [":server_access"],
+    exports = ["//services/shellexecutor/java/androidx/test/services/shellexecutor:exec_server"],
+)
+
+alias(
+    name = "exec_client",
+    actual = "//services/shellexecutor/java/androidx/test/services/shellexecutor:exec_client",
+    visibility = ["//visibility:public"],
+)
+
+# List any packages allowed to access to server exec server.
+package_group(
+    name = "server_access",
+    packages = [
+        "//services",
+        "//services/shellexecutor/javatests/androidx/test/services/shellexecutor",
+    ],
+)
diff --git a/android/instrumentation-testing/third_party/android-test/overlay/services/shellexecutor/java/androidx/test/services/shellexecutor/BUILD b/android/instrumentation-testing/third_party/android-test/overlay/services/shellexecutor/java/androidx/test/services/shellexecutor/BUILD
new file mode 100644
index 000000000..448ff5e12
--- /dev/null
+++ b/android/instrumentation-testing/third_party/android-test/overlay/services/shellexecutor/java/androidx/test/services/shellexecutor/BUILD
@@ -0,0 +1,115 @@
+load("@protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
+load("@protobuf//bazel:proto_library.bzl", "proto_library")
+load("@rules_android//android:rules.bzl", "android_library")
+load("@rules_java//java:defs.bzl", "java_library")
+load("//build_extensions:kt_android_library.bzl", "kt_android_library")
+
+# A shell command execution server to allow shell commands to be run at elevated permissions
+
+package(
+    default_applicable_licenses = ["//services:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+proto_library(
+    name = "local_socket_protocol_pb",
+    srcs = ["local_socket_protocol.proto"],
+)
+
+java_lite_proto_library(
+    name = "local_socket_protocol_pb_java_proto_lite",
+    visibility = [
+        "//services/shellexecutor/javatests/androidx/test/services/shellexecutor:__subpackages__",
+    ],
+    deps = [":local_socket_protocol_pb"],
+)
+
+kt_android_library(
+    name = "local_socket_protocol",
+    srcs = ["LocalSocketProtocol.kt"],
+    visibility = [
+        "//services/shellexecutor/javatests/androidx/test/services/shellexecutor:__subpackages__",
+    ],
+    deps = [
+        ":local_socket_protocol_pb_java_proto_lite",
+        "@maven//:org_jetbrains_kotlinx_kotlinx_coroutines_core",
+        "@protobuf//:protobuf_javalite",
+    ],
+)
+
+android_library(
+    name = "exec_idl",
+    idl_srcs = ["Command.aidl"],
+    visibility = ["//visibility:private"],
+)
+
+kt_android_library(
+    name = "exec_server",
+    srcs = [
+        "BlockingPublish.java",
+        "LocalSocketShellMain.kt",
+        "ShellCommand.java",
+        "ShellCommandExecutor.java",
+        "ShellCommandExecutorServer.java",
+        "ShellCommandLocalSocketExecutorServer.kt",
+        "ShellExecSharedConstants.java",
+        "ShellMain.java",
+    ],
+    visibility = [":export"],
+    deps = [
+        ":exec_idl",
+        ":local_socket_protocol",
+        ":local_socket_protocol_pb_java_proto_lite",
+        "//services/speakeasy/java/androidx/test/services/speakeasy:protocol",
+        "//services/speakeasy/java/androidx/test/services/speakeasy/client",
+        "//services/speakeasy/java/androidx/test/services/speakeasy/client:tool_connection",
+        "@maven//:com_google_guava_guava",
+        "@maven//:org_jetbrains_kotlinx_kotlinx_coroutines_core",
+    ],
+)
+
+kt_android_library(
+    name = "exec_client",
+    srcs = [
+        "BlockingFind.java",
+        "ClientNotConnected.java",
+        "ShellCommand.java",
+        "ShellCommandClient.java",
+        "ShellCommandLocalSocketClient.kt",
+        "ShellExecSharedConstants.java",
+        "ShellExecutor.java",
+        "ShellExecutorFactory.java",
+        "ShellExecutorImpl.java",
+        "ShellExecutorLocalSocketImpl.kt",
+    ],
+    visibility = [":export"],
+    deps = [
+        ":exec_idl",
+        ":local_socket_protocol",
+        ":local_socket_protocol_pb_java_proto_lite",
+        "//services/speakeasy/java/androidx/test/services/speakeasy:protocol",
+        "//services/speakeasy/java/androidx/test/services/speakeasy/client",
+        "//services/speakeasy/java/androidx/test/services/speakeasy/client:tool_connection",
+        "@maven//:org_jetbrains_kotlinx_kotlinx_coroutines_core",
+    ],
+)
+
+# Make it easy to deserialize exceptions that are sent over from device to host.
+java_library(
+    name = "exceptions",
+    srcs = [
+        "ClientNotConnected.java",
+    ],
+    visibility = [
+    ],
+)
+
+# Do not link to these targets directly, rely on exporting target instead
+package_group(
+    name = "export",
+    packages = [
+        "//services/shellexecutor",
+    ],
+)
diff --git a/android/instrumentation-testing/third_party/android-test/overlay/services/speakeasy/java/androidx/test/services/speakeasy/BUILD b/android/instrumentation-testing/third_party/android-test/overlay/services/speakeasy/java/androidx/test/services/speakeasy/BUILD
new file mode 100644
index 000000000..7555b5af2
--- /dev/null
+++ b/android/instrumentation-testing/third_party/android-test/overlay/services/speakeasy/java/androidx/test/services/speakeasy/BUILD
@@ -0,0 +1,16 @@
+load("@rules_android//android:rules.bzl", "android_library")
+
+package(
+    default_applicable_licenses = ["//services:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+android_library(
+    name = "protocol",
+    srcs = ["SpeakEasyProtocol.java"],
+    visibility = [
+        "//services:__subpackages__",
+    ],
+)
diff --git a/android/instrumentation-testing/third_party/android-test/overlay/services/speakeasy/java/androidx/test/services/speakeasy/client/BUILD b/android/instrumentation-testing/third_party/android-test/overlay/services/speakeasy/java/androidx/test/services/speakeasy/client/BUILD
new file mode 100644
index 000000000..0b5d11a69
--- /dev/null
+++ b/android/instrumentation-testing/third_party/android-test/overlay/services/speakeasy/java/androidx/test/services/speakeasy/client/BUILD
@@ -0,0 +1,62 @@
+load("@rules_android//android:rules.bzl", "android_library")
+
+package(
+    default_applicable_licenses = ["//services:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+android_library(
+    name = "connection",
+    srcs = ["Connection.java"],
+    deps = [":receivers"],
+)
+
+android_library(
+    name = "tool_connection",
+    srcs = ["ToolConnection.java"],
+    visibility = [
+        "//services:__subpackages__",
+    ],
+    exports = [
+        ":connection",
+        ":receivers",
+    ],
+    deps = [
+        ":connection",
+        ":receivers",
+        "//services/speakeasy/java/androidx/test/services/speakeasy:protocol",
+        "//services/speakeasy/java/androidx/test/services/speakeasy/compilehelp/hidden_api:ActivityManagerNative",
+    ],
+)
+
+android_library(
+    name = "receivers",
+    srcs = [
+        "FindResultReceiver.java",
+        "PublishResultReceiver.java",
+    ],
+    deps = [
+        "//services/speakeasy/java/androidx/test/services/speakeasy:protocol",
+    ],
+)
+
+android_library(
+    name = "client",
+    srcs = [
+        "AppConnection.java",
+    ],
+    visibility = [
+        "//services:__subpackages__",
+    ],
+    exports = [
+        ":connection",
+        ":receivers",
+    ],
+    deps = [
+        ":connection",
+        ":receivers",
+        "//services/speakeasy/java/androidx/test/services/speakeasy:protocol",
+    ],
+)
diff --git a/android/instrumentation-testing/third_party/android-test/overlay/services/speakeasy/java/androidx/test/services/speakeasy/compilehelp/hidden_api/BUILD b/android/instrumentation-testing/third_party/android-test/overlay/services/speakeasy/java/androidx/test/services/speakeasy/compilehelp/hidden_api/BUILD
new file mode 100644
index 000000000..1557e7c53
--- /dev/null
+++ b/android/instrumentation-testing/third_party/android-test/overlay/services/speakeasy/java/androidx/test/services/speakeasy/compilehelp/hidden_api/BUILD
@@ -0,0 +1,32 @@
+load("@rules_android//android:rules.bzl", "android_library")
+
+package(
+    default_applicable_licenses = ["//services:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+android_library(
+    name = "IActivityManager",
+    srcs = ["IActivityManager.java"],
+    neverlink = 1,
+    deps = [
+        ":IApplicationThread",
+    ],
+)
+
+android_library(
+    name = "ActivityManagerNative",
+    srcs = ["ActivityManagerNative.java"],
+    neverlink = 1,
+    visibility = [
+        "//services/speakeasy/java/androidx/test/services/speakeasy/client:__pkg__",
+    ],
+    deps = [":IActivityManager"],
+)
+
+android_library(
+    name = "IApplicationThread",
+    srcs = ["IApplicationThread.java"],
+)
diff --git a/android/instrumentation-testing/third_party/android-test/overlay/services/speakeasy/java/androidx/test/services/speakeasy/server/BUILD b/android/instrumentation-testing/third_party/android-test/overlay/services/speakeasy/java/androidx/test/services/speakeasy/server/BUILD
new file mode 100644
index 000000000..f9cc1046e
--- /dev/null
+++ b/android/instrumentation-testing/third_party/android-test/overlay/services/speakeasy/java/androidx/test/services/speakeasy/server/BUILD
@@ -0,0 +1,46 @@
+load("@rules_android//android:rules.bzl", "android_library")
+
+package(
+    default_applicable_licenses = ["//services:license"],
+    default_testonly = 1,
+    default_visibility = [
+        "//services:__subpackages__",
+        "//services/speakeasy/javatests/androidx/test/services/speakeasy/server:__pkg__",
+    ],
+)
+
+licenses(["notice"])
+
+android_library(
+    name = "speak_easy_core",
+    srcs = ["SpeakEasy.java"],
+    deps = [
+        "//services/speakeasy/java/androidx/test/services/speakeasy:protocol",
+        "@maven//:com_google_guava_guava",
+    ],
+)
+
+android_library(
+    name = "speak_easy_service",
+    srcs = [
+        "SpeakEasyContentProvider.java",
+        "SpeakEasyService.java",
+    ],
+    manifest = "AndroidManifest.xml",
+    resource_files = glob(["res/**"]),
+    visibility = [
+        "//services:__subpackages__",
+        "//services/speakeasy/javatests/androidx/test/services/speakeasy:__subpackages__",
+    ],
+    deps = [
+        ":speak_easy_core",
+        "//services/speakeasy/java/androidx/test/services/speakeasy:protocol",
+        "@maven//:androidx_core_core",
+        "@maven//:com_google_guava_guava",
+    ],
+)
+
+android_library(
+    name = "server",
+    exports = [":speak_easy_service"],
+)
diff --git a/android/instrumentation-testing/third_party/android-test/overlay/services/storage/java/androidx/test/services/storage/BUILD b/android/instrumentation-testing/third_party/android-test/overlay/services/storage/java/androidx/test/services/storage/BUILD
new file mode 100644
index 000000000..e0d550880
--- /dev/null
+++ b/android/instrumentation-testing/third_party/android-test/overlay/services/storage/java/androidx/test/services/storage/BUILD
@@ -0,0 +1,95 @@
+# Description:
+#   Exposes sd card storage to tests regardless of permissions.
+
+load("@protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
+load("@protobuf//bazel:java_proto_library.bzl", "java_proto_library")
+load("@protobuf//bazel:proto_library.bzl", "proto_library")
+load("@rules_android//android:rules.bzl", "android_library")
+load("@rules_java//java:defs.bzl", "java_library")
+load("//build_extensions:api_checks.bzl", "api_checks")
+load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar")
+load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact")
+
+package(
+    default_applicable_licenses = ["//services:license"],
+    default_testonly = 1,
+    default_visibility = [
+        "//:__subpackages__",
+    ],
+)
+
+licenses(["notice"])
+
+android_library(
+    name = "storage",
+    srcs = [
+        "TestStorage.java",
+        "TestStorageException.java",
+        "internal/TestStorageUtil.java",
+        "internal/package-info.java",
+    ],
+    manifest = "AndroidManifest.xml",
+    # TODO(b/323189093): remove when TestStorage -> PlatformTestStorage LSC is complete
+    exports = [
+        "//runner/monitor",
+    ],
+    deps = [
+        ":test_storage_constants",
+        "//opensource/androidx:annotation",
+        "//runner/monitor",
+        "//services/storage/java/androidx/test/services/storage/file",
+    ],
+)
+
+# Constants shared between on-device (android) and host-side (java code) testing
+# infrastructure for the storage service.
+java_library(
+    name = "test_storage_constants",
+    srcs = ["TestStorageConstants.java"],
+    deps = [
+        "//opensource/androidx:annotation",
+    ],
+)
+
+# Proto libs for the storage service.
+proto_library(
+    name = "storage_service_pb",
+    srcs = ["test_storage_service.proto"],
+)
+
+java_lite_proto_library(
+    name = "storage_service_pb_java_proto_lite",
+    deps = [":storage_service_pb"],
+)
+
+java_proto_library(
+    name = "storage_service_pb_java_proto",
+    deps = [":storage_service_pb"],
+)
+
+axt_android_aar(
+    name = "test_storage_aar",
+    expected_class_prefixes = [
+        "androidx.test.services.storage",
+    ],
+    included_dep = ":storage",
+)
+
+maven_artifact(
+    name = "test_storage_maven_artifact",
+    last_updated = "2020020700000",
+    target = ":test_storage_aar",
+)
+
+# no public documentation
+# dackka_test(
+#     name = "test_storage_doc",
+#     runtime_dep = ":storage",
+#     src_jar = ":test_storage_aar-src.jar",
+# )
+
+api_checks(
+    name = "storage_api",
+    runtime_dep = ":storage",
+    src_jar = ":test_storage_aar-src.jar",
+)
diff --git a/android/instrumentation-testing/third_party/android-test/overlay/services/storage/java/androidx/test/services/storage/file/BUILD b/android/instrumentation-testing/third_party/android-test/overlay/services/storage/java/androidx/test/services/storage/file/BUILD
new file mode 100644
index 000000000..2fe34b1b2
--- /dev/null
+++ b/android/instrumentation-testing/third_party/android-test/overlay/services/storage/java/androidx/test/services/storage/file/BUILD
@@ -0,0 +1,22 @@
+load("@rules_android//android:rules.bzl", "android_library")
+
+package(
+    default_applicable_licenses = ["//services:license"],
+    default_testonly = 1,
+    default_visibility = [
+        "//services/storage:__subpackages__",
+    ],
+)
+
+licenses(["notice"])
+
+# Intended for internal use only.
+android_library(
+    name = "file",
+    srcs = glob(["*.java"]),
+    deps = [
+        "//opensource/androidx:annotation",
+        "//runner/monitor",
+        "//services/storage/java/androidx/test/services/storage:test_storage_constants",
+    ],
+)
diff --git a/android/instrumentation-testing/third_party/android-test/overlay/services/storage/java/androidx/test/services/storage/provider/BUILD b/android/instrumentation-testing/third_party/android-test/overlay/services/storage/java/androidx/test/services/storage/provider/BUILD
new file mode 100644
index 000000000..e657b0a10
--- /dev/null
+++ b/android/instrumentation-testing/third_party/android-test/overlay/services/storage/java/androidx/test/services/storage/provider/BUILD
@@ -0,0 +1,22 @@
+load("@rules_android//android:rules.bzl", "android_library")
+
+package(
+    default_applicable_licenses = ["//services:license"],
+    default_testonly = 1,
+    default_visibility = ["//services:__subpackages__"],
+)
+
+licenses(["notice"])
+
+# Content providers that provide read write or read only access to the SDCard.
+android_library(
+    name = "storage_content_providers",
+    srcs = glob(["*.java"]),
+    manifest = "AndroidManifest.xml",
+    deps = [
+        "//runner/monitor",
+        "//services/storage/java/androidx/test/services/storage:storage_service_pb_java_proto_lite",
+        "//services/storage/java/androidx/test/services/storage:test_storage_constants",
+        "//services/storage/java/androidx/test/services/storage/file",
+    ],
+)
diff --git a/android/instrumentation-testing/third_party/android-test/overlay/tools/android/emulator/BUILD.bazel b/android/instrumentation-testing/third_party/android-test/overlay/tools/android/emulator/BUILD.bazel
new file mode 100644
index 000000000..7435516a6
--- /dev/null
+++ b/android/instrumentation-testing/third_party/android-test/overlay/tools/android/emulator/BUILD.bazel
@@ -0,0 +1,313 @@
+# Copyright 2017 Google Inc. All Rights Reserved.
+#
+# Description:
+#   Build rules to help with launching the android emulator.
+
+# Some of the py_* rules in this file set `imports = ["../../.."]`. This is due
+# to the fact that some of these rules depend on targets in external
+# repositories and Bazel does not guarantee that the main repository shows up
+# in the Python path before the external repositories. This causes conflicts
+# with any external repositories that contain Python or native code that contain
+# a top-level directory called "tools". In particular @androidsdk contains one.
+#
+# The imports attribute adds the given directory, relative to the target, to the
+# front of the Python path. As such "../../.." resolves to the root of this
+# repository. So any Python code that contains "import tools.something" will
+# find //tools before @androidsdk//:tools.
+
+load("@protobuf//bazel:java_proto_library.bzl", "java_proto_library")
+load("@protobuf//bazel:proto_library.bzl", "proto_library")
+load("@rules_python//python:defs.bzl", "py_binary", "py_library", "py_test")
+
+package(default_visibility = ["//visibility:public"])
+
+proto_library(
+    name = "emulator_meta_data_pb",
+    srcs = ["emulator_meta_data.proto"],
+)
+
+java_proto_library(
+    name = "emulator_meta_data_pb_java_proto",
+    deps = [":emulator_meta_data_pb"],
+)
+
+py_library(
+    name = "emulator_meta_data_pb_py_pb2",
+    srcs = ["emulator_meta_data_pb2.py"],
+    deps = ["@protobuf//:protobuf_python"],
+)
+
+MOX = "@mox_archive//:mox"
+
+PYGLIB = [
+    "@absl_py//absl:app",
+    "@absl_py//absl/flags",
+    "@absl_py//absl/logging",
+    "@google_apputils//:apputils",
+]
+
+PORTPICKER = "@portpicker_archive//:portpicker"
+
+M2CRYPTO = "//third_party/py/M2Crypto"
+
+TESTING_PYBASE = ":resources"
+
+genrule(
+    name = "default_sdcard_img",
+    srcs = ["support/default_sdcard.256.img.tar.gz"],
+    outs = ["support/default_sdcard.256.img"],
+    cmd = "tar -xzvf $< -O > $@",
+)
+
+# An implicit dependancy of all android_devices - modify with care!
+filegroup(
+    name = "xvfb_support",
+    # support dependencies for using the emulator (eg - xvfb, polite adb.)
+    srcs = [
+        "support/adb.turbo",
+        "support/cache.img.tar.gz",
+        "support/default_sdcard.256.img.tar.gz",
+        "support/waterfall/forward_bin",
+        "support/waterfall/ports_bin",
+        "support/waterfall/waterfall_bin",
+    ],
+)
+
+py_library(
+    name = "common",
+    srcs = ["common.py"],
+    deps = [
+        "@absl_py//absl:app",
+        "@absl_py//absl/flags",
+        "@absl_py//absl/logging",
+    ],
+)
+
+py_test(
+    name = "common_test",
+    srcs = ["common_test.py"],
+    python_version = "PY3",
+    deps = [
+        ":common",
+        MOX,
+        "@six_archive//:six",
+    ],
+)
+
+py_test(
+    name = "common_subprocess_test",
+    srcs = ["common_subprocess_test.py"],
+    python_version = "PY3",
+    deps = [
+        ":common",
+    ],
+)
+
+filegroup(
+    name = "daemon",
+    srcs = glob(["daemon/**"]),
+)
+
+py_library(
+    name = "emulated_device",
+    srcs = ["emulated_device.py"],
+    data = [
+        ":daemon",
+        ":xvfb_support",
+    ],
+    deps = [
+        ":common",
+        ":emulator_meta_data_pb_py_pb2",
+        ":reporting",
+        ":xserver",
+        PORTPICKER,
+    ] + PYGLIB,
+)
+
+py_binary(
+    name = "unified_launcher_head",
+    srcs = ["unified_launcher.py"],
+    imports = ["../../.."],
+    main = "unified_launcher.py",
+    python_version = "PY3",
+    deps = [
+        ":emulated_device",
+        ":emulator_meta_data_pb_py_pb2",
+        ":reporting",
+        ":resources",
+        ":xserver",
+        "@protobuf//:protobuf_python",
+        PORTPICKER,
+    ] + PYGLIB,
+)
+
+py_library(
+    name = "xserver",
+    srcs = ["xserver.py"],
+    deps = PYGLIB,
+)
+
+py_test(
+    name = "xserver_test",
+    size = "medium",
+    srcs = ["xserver_test.py"],
+    data = [
+        ":xres",
+    ],
+    python_version = "PY3",
+    deps = [
+        ":resources",
+        ":xserver",
+    ],
+)
+
+py_library(
+    name = "reporting",
+    srcs = ["reporting.py"],
+)
+
+py_library(
+    name = "fake_android_platform_util",
+    srcs = ["fake_android_platform_util.py"],
+    deps = [
+        ":emulated_device",
+    ] + PYGLIB,
+)
+
+py_binary(
+    name = "xres",
+    testonly = 1,
+    srcs = ["xres.py"],
+    python_version = "PY3",
+    visibility = ["//visibility:private"],
+)
+
+py_test(
+    name = "emulated_device_test",
+    srcs = ["emulated_device_test.py"],
+    args = [
+        # The "../" in these paths is how Bazel arranges external repositories
+        # in the runfiles tree. The tests are run in
+        # <runfiles base>/android_test_support because the name of the current
+        # repository is android_test_support. Since these dependencies come from
+        # the androidsdk repository, they are located in
+        # <runfiles base>/androidsdk.
+        "--system_image_dir=../androidsdk/system-images/android-10/default/armeabi-v7a",
+        "--android_sdk_path=../androidsdk",
+    ],
+    data = [
+        ":android_sdk_repository_emulator_tools",
+        "@androidsdk//:emulator_images_android_10_arm",
+    ],
+    imports = ["../../.."],
+    python_version = "PY3",
+    deps = [
+        ":emulated_device",
+        ":fake_android_platform_util",
+        TESTING_PYBASE,
+        MOX,
+    ],
+)
+
+py_test(
+    name = "emulated_device_integration_test_arm",
+    size = "large",
+    srcs = ["emulated_device_integration_test_arm.py"],
+    args = [
+        "--system_image_dir=../androidsdk/system-images/android-10/default/armeabi-v7a",
+        "--android_sdk_path=../androidsdk",
+    ],
+    data = [
+        ":android_sdk_repository_emulator_tools",
+        "@androidsdk//:emulator_images_android_10_arm",
+    ],
+    imports = ["../../.."],
+    python_version = "PY3",
+    deps = [
+        ":emulated_device",
+        ":fake_android_platform_util",
+        TESTING_PYBASE,
+    ],
+)
+
+py_test(
+    name = "unified_launcher_test",
+    srcs = ["unified_launcher_test.py"],
+    data = [
+        ":xvfb_support",
+    ],
+    python_version = "PY3",
+    deps = [
+        ":unified_launcher_head",
+        TESTING_PYBASE,
+        MOX,
+    ],
+)
+
+GL_API_LEVELS = [
+    "15",
+    "16",
+    "17",
+    "18",
+    "19",
+    "21",
+]
+
+[
+    py_test(
+        name = "emulated_device_software_open_gl_integration_test_%s" % api,
+        size = "large",
+        srcs = ["emulated_device_software_open_gl_integration_test.py"],
+        args = [
+            "--api_level=%s" % api,
+            "--system_image_dir=../androidsdk/system-images/android-%s/default/x86" % api,
+            "--android_sdk_path=../androidsdk",
+        ],
+        data = [
+            "@androidsdk//:emulator_images_android_%s_x86" % api,
+            "@androidsdk//:emulator_images_android_%s_x86_qemu2_extra" % api,
+            ":android_sdk_repository_emulator_tools",
+            ":xvfb_support",
+        ],
+        main = "emulated_device_software_open_gl_integration_test.py",
+        python_version = "PY3",
+        tags = [
+            "opengl",
+            "requires-kvm",
+        ],
+        deps = [
+            ":emulated_device",
+            ":fake_android_platform_util",
+            ":xserver",
+            TESTING_PYBASE,
+        ],
+    )
+    for api in GL_API_LEVELS
+]
+
+py_library(
+    name = "resources",
+    srcs = ["resources.py"],
+)
+
+py_test(
+    name = "resources_test",
+    srcs = ["resources_test.py"],
+    python_version = "PY3",
+    deps = [
+        ":resources",
+    ] + PYGLIB,
+)
+
+filegroup(
+    name = "android_sdk_repository_emulator_tools",
+    srcs = [
+        "@androidsdk//:adb",
+        "@androidsdk//:emulator_arm",
+        "@androidsdk//:emulator_shared_libs",
+        "@androidsdk//:emulator_x86",
+        "@androidsdk//:emulator_x86_bios",
+        "@androidsdk//:mksd",
+        "@bazel_tools//tools/android/emulator:empty_snapshot_fs",
+    ],
+)
diff --git a/android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/broker/BUILD.bazel b/android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/broker/BUILD.bazel
new file mode 100644
index 000000000..240b466e8
--- /dev/null
+++ b/android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/broker/BUILD.bazel
@@ -0,0 +1,311 @@
+# -*- mode: python; -*-
+#
+# Description:
+#   An interface for tests to access physical or virtual devices.
+
+load("@rules_java//java:defs.bzl", "java_library", "java_test")
+
+licenses(["notice"])  # Apache 2.0
+
+java_library(
+    name = "struct",
+    srcs = [
+        "ExecutedTest.java",
+        "Instrumentation.java",
+    ],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//opensource/auto_value",
+        "@maven//:com_google_code_findbugs_jsr305",
+    ],
+)
+
+java_library(
+    name = "enum",
+    srcs = ["NetworkType.java"],
+)
+
+java_library(
+    name = "anno",
+    srcs = ["DeviceBrokerAnnotations.java"],
+    deps = [
+        "@maven//:aopalliance_aopalliance",
+        "@maven//:com_google_inject_guice",
+    ],
+)
+
+java_library(
+    name = "environment",
+    srcs = [
+        "Environment.java",
+        "EnvironmentModule.java",
+    ],
+    deps = [
+        "@maven//:aopalliance_aopalliance",
+        "@maven//:com_google_code_findbugs_jsr305",
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_google_inject_guice",
+    ],
+)
+
+java_library(
+    name = "shared_constants",
+    srcs = [
+        "SharedEnvironment.java",
+    ],
+    visibility = ["//visibility:public"],
+    deps = [
+        ":environment",
+    ],
+)
+
+java_library(
+    name = "private_impl",
+    srcs = [
+        "AaptDumpPackageLineProcessor.java",
+        "AbstractRegexpLineProcessor.java",
+        "AdbDevicesLineProcessor.java",
+        "AdbInstrumentationListProcessor.java",
+        "AndroidPropertyProcessor.java",
+        "ExecReporter.java",
+        "InstrumentationTestRunnerProcessor.java",
+        "ShellVariableProcessor.java",
+        "SimpleLineListProcessor.java",
+        "StreamWritingProcessor.java",
+        "SubprocessCommunicator.java",
+    ],
+    deps = [
+        ":anno",
+        ":struct",
+        "//tools/device_broker/java/com/google/android/apps/common/testing/broker/shell",
+        "@maven//:com_google_code_findbugs_jsr305",
+        "@maven//:com_google_guava_guava",
+        "@maven//:javax_inject_javax_inject",
+    ],
+)
+
+java_library(
+    name = "port_manager_module",
+    srcs = [
+        "PortManager.java",
+        "PortManagerModule.java",
+    ],
+    deps = [
+        ":anno",
+        "@maven//:aopalliance_aopalliance",
+        "@maven//:com_google_code_findbugs_jsr305",
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_google_inject_guice",
+    ],
+)
+
+java_library(
+    name = "test_info",
+    srcs = [
+        "ModernDexDumpOutputNormalizer.java",
+        "TestInfoRepository.java",
+    ],
+    deps = [
+        ":anno",
+        ":environment",
+        ":struct",
+        "//tools/device_broker/java/com/google/android/apps/common/testing/broker/shell",
+        "//tools/device_broker/java/com/google/android/apps/common/testing/suite/dex",
+        "//tools/device_broker/proto:test_info_pb_java_proto",
+        "@maven//:com_google_guava_guava",
+        "@maven//:javax_inject_javax_inject",
+    ],
+)
+
+java_test(
+    name = "modern_dexdump_output_normalizer_test",
+    srcs = ["ModernDexDumpOutputNormalizerTest.java"],
+    test_class = "com.google.android.apps.common.testing.broker.ModernDexDumpOutputNormalizerTest",
+    deps = [
+        ":test_info",
+        "//tools/device_broker/java/com/google/android/apps/common/testing/suite/dex",
+        "//tools/device_broker/proto:test_info_pb_java_proto",
+        "@maven//:junit_junit",
+    ],
+)
+
+java_library(
+    name = "broker_intf",
+    srcs = [
+        "ActivityAction.java",
+        "AdbController.java",
+        "BadIdeaRuntimeException.java",
+        "BrokeredDevice.java",
+        "DeviceBroker.java",
+        "DeviceBrokerDecorator.java",
+        "DeviceBrokerType.java",
+        "HostTestSize.java",
+        "InstrumentationRepository.java",
+        "LogcatFilter.java",
+        "LogcatStreamer.java",
+        "OpenGlDriver.java",
+    ],
+    visibility = ["//visibility:public"],
+    deps = [
+        ":anno",
+        ":private_impl",
+        ":struct",
+        ":test_info",
+        "//tools/device_broker/java/com/google/android/apps/common/testing/broker/shell",
+        "//tools/device_broker/proto:test_info_pb_java_proto",
+        "@maven//:aopalliance_aopalliance",
+        "@maven//:com_google_code_findbugs_jsr305",
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_google_inject_guice",
+        "@maven//:javax_inject_javax_inject",
+    ],
+)
+
+java_library(
+    name = "broker_factory",
+    srcs = ["DeviceBrokerFactory.java"],
+    visibility = ["//visibility:public"],
+    deps = [
+        ":anno",
+        ":base_module",
+        ":broker_decorators",
+        ":broker_intf",
+        ":environment",
+        ":exec_reporter_module",
+        ":jcommander_support",
+        ":local_device",
+        ":port_manager_module",
+        ":wrapped_device",
+        "@maven//:aopalliance_aopalliance",
+        "@maven//:com_google_inject_extensions_guice_multibindings",
+        "@maven//:com_google_inject_guice",
+    ],
+)
+
+java_library(
+    name = "exec_reporter_module",
+    srcs = [
+        "ExecReporter.java",
+        "ExecReporterModule.java",
+        "NoOpExecReporter.java",
+    ],
+    deps = [
+        ":anno",
+        "@maven//:com_google_code_findbugs_jsr305",
+        "@maven//:com_google_inject_guice",
+        "@maven//:javax_inject_javax_inject",
+    ],
+)
+
+java_library(
+    name = "local_device",
+    srcs = [
+        "LocalAdbServerDeviceBroker.java",
+        "LocalBrokerModule.java",
+    ],
+    deps = [
+        ":anno",
+        ":broker_intf",
+        ":private_impl",
+        "@maven//:aopalliance_aopalliance",
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_google_inject_extensions_guice_multibindings",
+        "@maven//:com_google_inject_guice",
+        "@maven//:javax_inject_javax_inject",
+    ],
+)
+
+java_library(
+    name = "broker_decorators",
+    srcs = [
+        "BrokeredDeviceExportedPropertyRecorder.java",
+        "DataStagingDeviceBrokerDecorator.java",
+        "FixtureScriptExecutingDeviceBrokerDecorator.java",
+        "InstrumentationExecutingDeviceBrokerDecorator.java",
+        "ProxyConfiguringDeviceBrokerDecorator.java",
+        "ProxyConfiguringModule.java",
+    ],
+    deps = [
+        ":anno",  # ready
+        ":broker_intf",  # logcat filter :(
+        ":struct",  # ready
+        "@maven//:aopalliance_aopalliance",
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_google_inject_extensions_guice_multibindings",
+        "@maven//:com_google_inject_guice",
+        "@maven//:javax_inject_javax_inject",
+    ],
+)
+
+java_library(
+    name = "wrapped_device",
+    srcs = [
+        "WrappedBrokerModule.java",
+        "WrappedEmulatedDeviceBroker.java",
+    ],
+    data = [
+        "//runner/android_test_orchestrator/stubapp:stubapp.apk",
+    ],
+    deps = [
+        ":anno",
+        ":broker_intf",
+        ":enum",
+        ":environment",
+        ":private_impl",
+        "//tools/android/emulator:emulator_meta_data_pb_java_proto",
+        "@maven//:aopalliance_aopalliance",
+        "@maven//:com_google_code_findbugs_jsr305",
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_google_inject_extensions_guice_multibindings",
+        "@maven//:com_google_inject_guice",
+        "@protobuf//:protobuf_java",
+    ],
+)
+
+java_library(
+    name = "base_module",
+    srcs = [
+        "AaptUtil.java",
+        "DeviceBrokerModule.java",
+        "DirectorySearcher.java",
+        "ResourceProvider.java",
+    ],
+    data = [
+        "@androidsdk//:adb",
+    ],
+    resources = [
+        ":executor.sh",
+        "//runner/android_test_orchestrator/stubapp:stubapp.apk",
+        "//services:test_services.apk",
+    ],
+    deps = [
+        ":anno",
+        ":broker_intf",
+        ":enum",
+        ":environment",
+        ":private_impl",
+        "@maven//:aopalliance_aopalliance",
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_google_inject_extensions_guice_multibindings",
+        "@maven//:com_google_inject_guice",
+        "@maven//:javax_inject_javax_inject",
+    ],
+)
+
+java_library(
+    name = "jcommander_support",
+    srcs = [
+        "DeviceBrokerOptions.java",
+        "EnumConverters.java",
+        "LogcatFilterConverter.java",
+    ],
+    deps = [
+        ":anno",
+        ":broker_intf",
+        ":enum",
+        "@maven//:com_beust_jcommander",
+        "@maven//:com_google_code_findbugs_jsr305",
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_google_inject_guice",
+    ],
+)
diff --git a/android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/broker/LocalAdbServerDeviceBroker.java b/android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/broker/LocalAdbServerDeviceBroker.java
new file mode 100644
index 000000000..3a761ab32
--- /dev/null
+++ b/android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/broker/LocalAdbServerDeviceBroker.java
@@ -0,0 +1,292 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.apps.common.testing.broker;
+
+import com.google.android.apps.common.testing.broker.AdbController.AdbControllerFactory;
+import com.google.android.apps.common.testing.broker.DeviceBrokerAnnotations.AdbEnvironment;
+import com.google.android.apps.common.testing.broker.DeviceBrokerAnnotations.AdbServerPort;
+import com.google.android.apps.common.testing.broker.DeviceBrokerAnnotations.ApksToInstall;
+import com.google.android.apps.common.testing.broker.DeviceBrokerAnnotations.DeviceControllerPath;
+import com.google.android.apps.common.testing.broker.DeviceBrokerAnnotations.DeviceSerialNumber;
+import com.google.android.apps.common.testing.broker.DeviceBrokerAnnotations.GrantRuntimePermissions;
+import com.google.android.apps.common.testing.broker.DeviceBrokerAnnotations.InitialIME;
+import com.google.android.apps.common.testing.broker.DeviceBrokerAnnotations.InitialLocale;
+import com.google.android.apps.common.testing.broker.DeviceBrokerAnnotations.InstallTestServices;
+import com.google.android.apps.common.testing.broker.DeviceBrokerAnnotations.LogcatPath;
+import com.google.android.apps.common.testing.broker.DeviceBrokerAnnotations.PackageName;
+import com.google.android.apps.common.testing.broker.DeviceBrokerAnnotations.PreverifyApks;
+import com.google.android.apps.common.testing.broker.DeviceBrokerAnnotations.ReuseApks;
+import com.google.android.apps.common.testing.broker.DeviceBrokerAnnotations.TestServicesApksToInstall;
+import com.google.android.apps.common.testing.broker.LogcatStreamer.OutputFormat;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Joiner;
+import com.google.common.base.Optional;
+import com.google.common.cache.LoadingCache;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+import com.google.inject.Provider;
+import com.google.inject.Singleton;
+import java.io.File;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.inject.Inject;
+
+/**
+ * A broker that provides access to devices connected to the local adb server.
+ *
+ */
+@Singleton
+class LocalAdbServerDeviceBroker implements DeviceBroker {
+  private static final Logger logger = Logger.getLogger("LocalDeviceBroker");
+  private static final Joiner SPACE_SEP = Joiner.on(" ");
+  private static final int DEFAULT_ADB_SERVER_PORT = 5037;
+  private static final String FLAG_RECEIVER_FOREGROUND = "268435456"; // 0x10000000
+
+  @VisibleForTesting
+  static final String DALVIK_VM_DEXOPT_FLAGS = "dalvik.vm.dexopt-flags";
+  @VisibleForTesting
+  static final String PREVERIFY_ON_SUBSTRING = "v=n";
+  @VisibleForTesting
+  static final String PREVERIFY_ON = "v=y,o=v";
+  @VisibleForTesting
+  static final String PREVERIFY_OFF = "v=n,o=v";
+
+  private final Optional<Integer> adbServerPort;
+  private final String adbPath;
+  private final AdbControllerFactory adbControllerFactory;
+  private final List<String> apksToInstall;
+  private final List<String> testServicesApksToInstall;
+  private final boolean installTestServices;
+  private final Provider<String> logcatFilePathProvider;
+  private final Provider<SubprocessCommunicator.Builder> communicatorBuilderProvider;
+  private final Provider<AdbDevicesLineProcessor> adbDevicesLineProcessor;
+  private final LoadingCache<String, String> packageNameCache;
+  private final Map<String, String> adbEnvironment;
+  private final boolean enablePreverify;
+  private final boolean enableApkReuse;
+  private final String initialLocale;
+  private final String initialIME;
+  private String deviceSerialNumber;
+  private Set<String> leasedDeviceSerialNumbers = Sets.newHashSet();
+  private LogcatStreamer logcatStreamer;
+  private final boolean grantRuntimePermissions;
+
+  @Inject
+  LocalAdbServerDeviceBroker(
+      @AdbServerPort Optional<Integer> adbServerPort,
+      @DeviceControllerPath String adbPath,
+      AdbControllerFactory adbControllerFactory,
+      @ApksToInstall List<String> apksToInstall,
+      @TestServicesApksToInstall List<String> testServicesApksToInstall,
+      @InstallTestServices boolean installTestServices,
+      @LogcatPath Provider<String> logcatFilePathProvider,
+      Provider<SubprocessCommunicator.Builder> communicatorBuilderProvider,
+      @DeviceSerialNumber String deviceSerialNumber,
+      Provider<AdbDevicesLineProcessor> adbDevicesLineProcessor,
+      @PackageName LoadingCache<String, String> packageNameCache,
+      @AdbEnvironment Map<String, String> adbEnvironment,
+      @PreverifyApks boolean enablePreverify,
+      @ReuseApks boolean enableApkReuse,
+      @InitialLocale String initialLocale,
+      @InitialIME String initialIME,
+      @GrantRuntimePermissions boolean grantRuntimePermissions) {
+    this.adbPath = adbPath;
+    this.adbControllerFactory = adbControllerFactory;
+    this.apksToInstall = apksToInstall;
+    this.testServicesApksToInstall = testServicesApksToInstall;
+    this.installTestServices = installTestServices;
+    this.logcatFilePathProvider = logcatFilePathProvider;
+    this.communicatorBuilderProvider = communicatorBuilderProvider;
+    this.deviceSerialNumber = deviceSerialNumber;
+    this.adbServerPort = adbServerPort;
+    this.adbDevicesLineProcessor = adbDevicesLineProcessor;
+    this.packageNameCache = packageNameCache;
+    this.adbEnvironment = adbEnvironment;
+    this.enablePreverify = enablePreverify;
+    this.enableApkReuse = enableApkReuse;
+    this.initialLocale = initialLocale;
+    this.initialIME = initialIME;
+    this.grantRuntimePermissions = grantRuntimePermissions;
+  }
+
+  @Override
+  public BrokeredDevice leaseDevice() {
+    boolean doExplicitConnect = true;
+    if (deviceSerialNumber.equals("")) {
+      deviceSerialNumber = getSerialNumberFromAdbDevices();
+      // since we see it in adb devices, do not need to connect to it
+      doExplicitConnect = false;
+    } else if (deviceSerialNumber.startsWith("emulator-")) {
+      doExplicitConnect = false;
+    }
+    String logcatPath = logcatFilePathProvider.get();
+
+    BrokeredDevice device =
+        new BrokeredDevice.Builder()
+            .withAdbPath(adbPath)
+            .withAdbServerPort(adbServerPort.or(DEFAULT_ADB_SERVER_PORT))
+            .defaultDeviceType() // figure it out on demand.
+            .withLogcatPath(logcatPath)
+            .withSerialId(deviceSerialNumber)
+            .withAdbControllerFactory(adbControllerFactory)
+            .withAdbEnvironment(adbEnvironment)
+            .build();
+
+    AdbController adbController = adbControllerFactory.create(device);
+    if (doExplicitConnect) {
+      adbController.adbConnect();
+    }
+
+    startLogcatStream(adbController, logcatPath);
+
+    if (!leasedDeviceSerialNumbers.contains(deviceSerialNumber)) {
+      adbController.makeAdbCall("root");
+      adbController.makeAdbCall("wait-for-device");
+      installApks(adbController);
+      leasedDeviceSerialNumbers.add(deviceSerialNumber);
+    }
+
+    logger.info("About to broadcast ACTION_MOBILE_NINJAS_START");
+    Map<String, String> extras = Maps.newHashMap();
+    extras.put("initial_locale", initialLocale);
+    extras.put("initial_ime", initialIME);
+    device
+        .getAdbController()
+        .broadcastAction(
+            "ACTION_MOBILE_NINJAS_START",
+            FLAG_RECEIVER_FOREGROUND,
+            "com.google.android.apps.common.testing.services.bootstrap",
+            extras);
+    return device;
+  }
+
+  private void startLogcatStream(AdbController adbController, String logcatPath) {
+    logcatStreamer =
+        adbController.startLogcatStream(
+            new File(logcatPath),
+            LogcatStreamer.Buffer.MAIN,
+            OutputFormat.THREADTIME,
+            Lists.<LogcatFilter>newArrayList());
+  }
+
+  private void installApks(AdbController adbController) {
+    final String originalFlags = adbController.getDeviceProperty(DALVIK_VM_DEXOPT_FLAGS);
+
+    final boolean originalVerifyState =
+        originalFlags == null || !originalFlags.contains(PREVERIFY_ON_SUBSTRING);
+    final boolean swapFlags = originalVerifyState ^ enablePreverify;
+    if (swapFlags) {
+      if (enablePreverify) {
+        setDextoptFlags(adbController, PREVERIFY_ON);
+      } else {
+        setDextoptFlags(adbController, PREVERIFY_OFF);
+      }
+    }
+
+    List<String> allApksToInstall = apksToInstall;
+    if (installTestServices) {
+      allApksToInstall.addAll(testServicesApksToInstall);
+    }
+
+    for (String apk : allApksToInstall) {
+      String packageName = packageNameCache.getUnchecked(apk);
+
+      if (enableApkReuse) {
+        adbController.installApkIfNecessary(packageName, apk, grantRuntimePermissions);
+      } else {
+        logger.info("Apk reuse is disabled, will uninstall and reinstall apk " + apk);
+        adbController.uninstallApp(packageName);
+        adbController.installApk(apk, grantRuntimePermissions);
+      }
+    }
+
+    if (swapFlags) {
+      setDextoptFlags(adbController, originalFlags);
+    }
+  }
+
+  private void setDextoptFlags(AdbController adbController, String flags) {
+    try {
+      adbController.setDeviceProperty("dalvik.vm.dexopt-flags", flags);
+    } catch (RuntimeException e) {
+      logger.log(
+          Level.WARNING,
+          "Failed to set dalvik.vm.dexopt-flags. Continuing because non-rooted local devices may "
+              + "reject this property.",
+          e);
+    }
+  }
+
+  private String getSerialNumberFromAdbDevices() {
+    // Run "adb devices".
+    List<String> command = Lists.newArrayList(adbPath, "devices");
+    Map<String, String> environment = Maps.newHashMap(adbEnvironment);
+    environment.put(
+        "ANDROID_ADB_SERVER_PORT", String.valueOf(adbServerPort.or(DEFAULT_ADB_SERVER_PORT)));
+
+    AdbDevicesLineProcessor processor = adbDevicesLineProcessor.get();
+    communicatorBuilderProvider
+        .get()
+        .withArguments(command)
+        .withTimeout(120, TimeUnit.SECONDS)
+        .withStdoutProcessor(processor)
+        .withEnvironment(environment)
+        .build()
+        .communicate();
+
+    // Parse output.
+    List<String> result = processor.getResult();
+    if (result.isEmpty()) {
+      throw new RuntimeException(
+          "No devices found. Please ensure that 'adb devices' shows at least one device.");
+    }
+    if (result.size() > 1) {
+      StringBuilder errorStringBuilder =
+          new StringBuilder()
+              .append("More than one device found.")
+              .append("Select a device by providing --test_arg=--device_serial_number=\"<serial>\".\n")
+              .append("List of available devices:\n");
+      for (String serial : result) {
+        errorStringBuilder.append("- " + serial + "\n");
+      }
+      throw new RuntimeException(errorStringBuilder.toString());
+    }
+    return result.get(0);
+  }
+
+  @Override
+  public void freeDevice(BrokeredDevice device) {
+    if (logcatStreamer != null) {
+      logcatStreamer.stopStream();
+    }
+  }
+
+  @Override
+  public Map<String, Object> getExportedProperties() {
+    Map<String, Object> properties = Maps.newHashMap();
+    properties.put("adb_path", adbPath);
+    properties.put("adb_server_port", adbServerPort.or(DEFAULT_ADB_SERVER_PORT));
+    properties.put("device_serial_number", deviceSerialNumber);
+    properties.put("apks_to_install", SPACE_SEP.join(apksToInstall));
+    return properties;
+  }
+}
diff --git a/android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/broker/ModernDexDumpOutputNormalizer.java b/android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/broker/ModernDexDumpOutputNormalizer.java
new file mode 100644
index 000000000..f7a7ed513
--- /dev/null
+++ b/android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/broker/ModernDexDumpOutputNormalizer.java
@@ -0,0 +1,141 @@
+package com.google.android.apps.common.testing.broker;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/** Converts modern SDK dexdump XML output into the XML shape expected by DexDumpIterator. */
+final class ModernDexDumpOutputNormalizer {
+  private ModernDexDumpOutputNormalizer() {}
+
+  static void normalize(File dumpOutput) throws IOException {
+    Files.write(
+        dumpOutput.toPath(),
+        normalize(Files.readAllLines(dumpOutput.toPath(), StandardCharsets.UTF_8)),
+        StandardCharsets.UTF_8);
+  }
+
+  static List<String> normalize(List<String> lines) {
+    List<String> output = new ArrayList<>();
+    List<String> classAnnotations = new ArrayList<>();
+    Map<String, List<String>> methodAnnotations = new HashMap<>();
+    String annotationTarget = "";
+    String annotationMethodName = "";
+    String startElement = "";
+    String startMethodName = "";
+
+    for (String line : lines) {
+      String trimmed = line.trim();
+
+      if (trimmed.startsWith("Class #") && trimmed.endsWith(" annotations:")) {
+        classAnnotations.clear();
+        methodAnnotations.clear();
+        annotationTarget = "";
+        annotationMethodName = "";
+        continue;
+      }
+      if ("Annotations on class".equals(trimmed)) {
+        annotationTarget = "class";
+        annotationMethodName = "";
+        continue;
+      }
+      if (trimmed.startsWith("Annotations on method #")) {
+        annotationTarget = "method";
+        annotationMethodName = textBetweenLastQuotes(trimmed);
+        continue;
+      }
+      if (trimmed.startsWith("Annotations on field #")) {
+        annotationTarget = "";
+        annotationMethodName = "";
+        continue;
+      }
+      if (trimmed.startsWith("VISIBILITY_")) {
+        String annotationClass = annotationClassName(trimmed);
+        if (annotationClass != null) {
+          if ("class".equals(annotationTarget)) {
+            classAnnotations.add(annotationClass);
+          } else if ("method".equals(annotationTarget) && !"".equals(annotationMethodName)) {
+            methodAnnotations
+                .computeIfAbsent(annotationMethodName, unused -> new ArrayList<>())
+                .add(annotationClass);
+          }
+        }
+        continue;
+      }
+      if ("empty-annotation-set".equals(trimmed)) {
+        continue;
+      }
+
+      output.add(line);
+      if (trimmed.startsWith("<class ")) {
+        startElement = "class";
+      } else if (trimmed.startsWith("<method ")) {
+        startElement = "method";
+        startMethodName = attributeValue(trimmed, "name");
+      } else if (">".equals(trimmed)) {
+        if ("class".equals(startElement)) {
+          addAnnotations(output, classAnnotations);
+        } else if ("method".equals(startElement)) {
+          addAnnotations(output, methodAnnotations.get(startMethodName));
+        }
+        startElement = "";
+        startMethodName = "";
+      }
+    }
+
+    return output;
+  }
+
+  private static void addAnnotations(List<String> output, List<String> annotationClasses) {
+    if (annotationClasses == null) {
+      return;
+    }
+    for (String annotationClass : annotationClasses) {
+      if (annotationClass.startsWith("dalvik.annotation.")) {
+        continue;
+      }
+      output.add("<annotation type=\"" + annotationClass + "\">");
+      output.add("</annotation>");
+    }
+  }
+
+  private static String annotationClassName(String line) {
+    int start = line.indexOf(" L");
+    int end = line.indexOf(';', start);
+    if (start == -1 || end == -1 || start >= end) {
+      return null;
+    }
+    return line.substring(start + 2, end).replace('/', '.');
+  }
+
+  private static String attributeValue(String line, String attributeName) {
+    String prefix = attributeName + "=\"";
+    int start = line.indexOf(prefix);
+    if (start == -1) {
+      return "";
+    }
+    start += prefix.length();
+    int end = line.indexOf('"', start);
+    if (end == -1) {
+      return "";
+    }
+    return line.substring(start, end);
+  }
+
+  private static String textBetweenLastQuotes(String line) {
+    int end = line.lastIndexOf('\'');
+    if (end == -1) {
+      return "";
+    }
+    int start = line.lastIndexOf('\'', end - 1);
+    if (start == -1) {
+      return "";
+    }
+    return line.substring(start + 1, end);
+  }
+}
diff --git a/android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/broker/ModernDexDumpOutputNormalizerTest.java b/android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/broker/ModernDexDumpOutputNormalizerTest.java
new file mode 100644
index 000000000..5ee34680f
--- /dev/null
+++ b/android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/broker/ModernDexDumpOutputNormalizerTest.java
@@ -0,0 +1,176 @@
+package com.google.android.apps.common.testing.broker;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import com.google.android.apps.common.testing.proto.TestInfo.TestSuitePb;
+import com.google.android.apps.common.testing.suite.dex.DumpUtils;
+import java.io.ByteArrayInputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+@RunWith(JUnit4.class)
+public class ModernDexDumpOutputNormalizerTest {
+  @Test
+  public void normalize_removesModernAnnotationPreambleAndAddsXmlAnnotations() {
+    List<String> normalized =
+        ModernDexDumpOutputNormalizer.normalize(
+            modernDexDumpLines());
+
+    assertEquals(
+        Arrays.asList(
+            "<api>",
+            "<package name=\"com.example.android.instrumentation\"",
+            ">",
+            "<class name=\"GreeterInstrumentationTest\"",
+            " extends=\"java.lang.Object\"",
+            " interface=\"false\"",
+            " abstract=\"false\"",
+            " static=\"false\"",
+            " final=\"true\"",
+            " visibility=\"public\"",
+            ">",
+            "<annotation type=\"org.junit.runner.RunWith\">",
+            "</annotation>",
+            "<constructor name=\"GreeterInstrumentationTest\"",
+            " type=\"com.example.android.instrumentation.GreeterInstrumentationTest\"",
+            " static=\"false\"",
+            " final=\"false\"",
+            " visibility=\"public\"",
+            ">",
+            "</constructor>",
+            "<method name=\"testDefaultGreeting\"",
+            " return=\"void\"",
+            " abstract=\"false\"",
+            " native=\"false\"",
+            " synchronized=\"false\"",
+            " static=\"false\"",
+            " final=\"false\"",
+            " visibility=\"public\"",
+            ">",
+            "<annotation type=\"org.junit.Test\">",
+            "</annotation>",
+            "</method>",
+            "<method name=\"testNamedGreeting\"",
+            " return=\"void\"",
+            " abstract=\"false\"",
+            " native=\"false\"",
+            " synchronized=\"false\"",
+            " static=\"false\"",
+            " final=\"false\"",
+            " visibility=\"public\"",
+            ">",
+            "<annotation type=\"org.junit.Test\">",
+            "</annotation>",
+            "</method>",
+            "</class>",
+            "<class name=\"Helper\"",
+            " extends=\"java.lang.Object\"",
+            " interface=\"false\"",
+            " abstract=\"false\"",
+            " static=\"false\"",
+            " final=\"true\"",
+            " visibility=\"public\"",
+            ">",
+            "</class>",
+            "",
+            "</package>",
+            "</api>"),
+        normalized);
+  }
+
+  @Test
+  public void normalize_outputCanBeParsedForJUnit4Tests() {
+    String normalizedXml = String.join("\n", ModernDexDumpOutputNormalizer.normalize(
+        modernDexDumpLines()));
+
+    TestSuitePb suite =
+        DumpUtils.parseDexDump(
+                new ByteArrayInputStream(normalizedXml.getBytes(StandardCharsets.UTF_8)))
+            .getFirst();
+
+    assertEquals(2, suite.getInfoCount());
+    assertEquals("GreeterInstrumentationTest", suite.getInfo(0).getTestClass());
+    assertEquals("com.example.android.instrumentation", suite.getInfo(0).getTestPackage());
+
+    List<String> methods = new ArrayList<>();
+    for (int i = 0; i < suite.getInfoCount(); i++) {
+      methods.add(suite.getInfo(i).getTestMethod());
+    }
+
+    assertTrue(methods.contains("testDefaultGreeting"));
+    assertTrue(methods.contains("testNamedGreeting"));
+  }
+
+  private static List<String> modernDexDumpLines() {
+    return Arrays.asList(
+        "<api>",
+        "Class #7 annotations:",
+        "Annotations on class",
+        "  VISIBILITY_RUNTIME Lorg/junit/runner/RunWith; value=Landroidx/test/runner/AndroidJUnit4;",
+        "Annotations on method #10 'testDefaultGreeting'",
+        "  VISIBILITY_RUNTIME Lorg/junit/Test;",
+        "Annotations on method #11 'testNamedGreeting'",
+        "  VISIBILITY_RUNTIME Lorg/junit/Test;",
+        "Annotations on method #11 '<init>'",
+        "  VISIBILITY_SYSTEM Ldalvik/annotation/Signature; value={ ()V }",
+        "<package name=\"com.example.android.instrumentation\"",
+        ">",
+        "<class name=\"GreeterInstrumentationTest\"",
+        " extends=\"java.lang.Object\"",
+        " interface=\"false\"",
+        " abstract=\"false\"",
+        " static=\"false\"",
+        " final=\"true\"",
+        " visibility=\"public\"",
+        ">",
+        "<constructor name=\"GreeterInstrumentationTest\"",
+        " type=\"com.example.android.instrumentation.GreeterInstrumentationTest\"",
+        " static=\"false\"",
+        " final=\"false\"",
+        " visibility=\"public\"",
+        ">",
+        "</constructor>",
+        "<method name=\"testDefaultGreeting\"",
+        " return=\"void\"",
+        " abstract=\"false\"",
+        " native=\"false\"",
+        " synchronized=\"false\"",
+        " static=\"false\"",
+        " final=\"false\"",
+        " visibility=\"public\"",
+        ">",
+        "</method>",
+        "<method name=\"testNamedGreeting\"",
+        " return=\"void\"",
+        " abstract=\"false\"",
+        " native=\"false\"",
+        " synchronized=\"false\"",
+        " static=\"false\"",
+        " final=\"false\"",
+        " visibility=\"public\"",
+        ">",
+        "</method>",
+        "</class>",
+        "Class #8 annotations:",
+        "Annotations on class",
+        "  VISIBILITY_SYSTEM Ldalvik/annotation/AnnotationDefault;",
+        "<class name=\"Helper\"",
+        " extends=\"java.lang.Object\"",
+        " interface=\"false\"",
+        " abstract=\"false\"",
+        " static=\"false\"",
+        " final=\"true\"",
+        " visibility=\"public\"",
+        ">",
+        "</class>",
+        "",
+        "</package>",
+        "</api>");
+  }
+}
diff --git a/android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/broker/TestInfoRepository.java b/android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/broker/TestInfoRepository.java
new file mode 100644
index 000000000..84ce6c73a
--- /dev/null
+++ b/android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/broker/TestInfoRepository.java
@@ -0,0 +1,300 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.apps.common.testing.broker;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkState;
+
+import com.google.android.apps.common.testing.broker.DeviceBrokerAnnotations.ApksToInstall;
+import com.google.android.apps.common.testing.broker.DeviceBrokerAnnotations.DexdumpPath;
+import com.google.android.apps.common.testing.broker.DeviceBrokerAnnotations.IgnoreTestPackages;
+import com.google.android.apps.common.testing.broker.DeviceBrokerAnnotations.PackageName;
+import com.google.android.apps.common.testing.broker.DeviceBrokerAnnotations.SystemApksToInstall;
+import com.google.android.apps.common.testing.broker.shell.Command;
+import com.google.android.apps.common.testing.broker.shell.CommandException;
+import com.google.android.apps.common.testing.broker.shell.CommandResult;
+import com.google.android.apps.common.testing.proto.TestInfo.TestSuitePb;
+import com.google.android.apps.common.testing.suite.dex.DumpUtils;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Function;
+import com.google.android.apps.common.testing.suite.dex.DumpUtils.Pair;
+import com.google.common.base.Predicate;
+import com.google.common.cache.LoadingCache;
+import com.google.common.collect.FluentIterable;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.logging.Logger;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import javax.inject.Inject;
+
+// For Copybara OSS
+import java.util.Iterator;
+import com.google.common.collect.Iterators;
+// */
+
+/** Tracks test suites contained in apks. */
+public class TestInfoRepository {
+  private static final int BUFF_SIZE = 1024 * 12; // 0.5 mb
+
+  private final Map<String, String> packageNameToApkPath = Maps.newConcurrentMap();
+  private final AtomicBoolean initialized = new AtomicBoolean(false);
+  private final LoadingCache<String, String> apkPathToPackageNameCache;
+  private final Map<String, ImmutableSet<String>> targetToClasses = Maps.newConcurrentMap();
+  private final List<String> initialApks;
+  private final List<String> systemApks;
+  private final String dexdumpPath;
+  private final List<String> ignoreTestPackages;
+  private final Environment environment;
+
+  private static final Logger logger = Logger.getLogger(TestInfoRepository.class.getName());
+
+  @Inject
+  public TestInfoRepository(
+      @PackageName LoadingCache<String, String> apkPathToPackageNameCache,
+      @ApksToInstall List<String> initialApks,
+      @DexdumpPath String dexdumpPath,
+      @SystemApksToInstall List<String> systemApks,
+      @IgnoreTestPackages List<String> ignoreTestPackages,
+      Environment environment) {
+    this.apkPathToPackageNameCache = apkPathToPackageNameCache;
+    this.initialApks = initialApks;
+    this.dexdumpPath = dexdumpPath;
+    this.systemApks = systemApks;
+    this.ignoreTestPackages = ignoreTestPackages;
+    this.environment = environment;
+  }
+
+  /**
+   * Returns a proto holding information about tests found in the given instrumentation. Apks with
+   * multiple dex files are supported.
+   */
+  public TestSuitePb listTests(
+      Instrumentation instrumentation, List<String> additionalTestPackages) {
+    Set<String> apksToScan = new HashSet<>();
+    if (!ignoreTestPackages.contains(instrumentation.getAndroidPackage())) {
+      String testApkPath = getApkPathForPackage(instrumentation.getAndroidPackage());
+      apksToScan.add(testApkPath);
+    }
+    for (String testPackage : additionalTestPackages) {
+      if (!ignoreTestPackages.contains(testPackage)) {
+        String apkPath = getApkPathForPackage(testPackage);
+        apksToScan.add(apkPath);
+      }
+    }
+
+    List<InputStream> dexDumpFiles = Lists.newArrayList();
+    // The test apk may have multiple dex files, so give it the same multi-dex treatment as the
+    // target app.
+    for (String apkPath : apksToScan) {
+      dexDumpFiles.addAll(getDexDumpFilesFromApk(apkPath));
+    }
+
+    Pair<TestSuitePb, ImmutableSet<String>> dexDump =
+        DumpUtils.parseDexDump(dexDumpFiles.toArray(new InputStream[0]));
+    targetToClasses.put(instrumentation.getTargetPackage(), dexDump.getSecond());
+    TestSuitePb result = dexDump.getFirst();
+    logger.info(
+        String.format(
+            "Found %d test(s). Scanned %d dex file(s) in %d APK(s)",
+            result.getInfoCount(), dexDumpFiles.size(), apksToScan.size()));
+    return result;
+  }
+
+  public TestSuitePb listTestsInFiles(Instrumentation instrumentation, List<File> dexFiles) {
+    try {
+      List<InputStream> dexDumpFiles = Lists.newArrayList();
+      for (File dex : dexFiles) {
+        dexDumpFiles.add(runDexDump(dex.getCanonicalPath()));
+      }
+
+      Pair<TestSuitePb, ImmutableSet<String>> dexDump =
+          DumpUtils.parseDexDump(dexDumpFiles.toArray(new InputStream[dexDumpFiles.size()]));
+      targetToClasses.put(instrumentation.getTargetPackage(), dexDump.getSecond());
+
+      return dexDump.getFirst();
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  private List<InputStream> getDexDumpFilesFromApk(String apkPath) {
+    List<InputStream> dexDumpFiles = Lists.newArrayList();
+    try {
+      logger.info("Scanning: " + apkPath);
+      ZipFile apk = new ZipFile(new File(apkPath));
+      FluentIterable<ZipEntry> dexEntries = listDexFilesFrom(apk);
+      checkState(
+          dexEntries.size() > 0,
+          "%s: Apk is expected to have at least one dex file! APKs without dex files can be built"
+              + " but cannot be installed. Often this is an interaction between the"
+              + " binary_under_test attribute containing all classes that are also in the srcs"
+              + " and deps attributes of the android_test target itself.",
+          apkPath);
+      // As of Apr 2015, dexdump tool extracts info only from the first dex file (classes.dex) of
+      // an apk. If the apk contains only one dex, running dexdump on the apk is good enough.
+      // Otherwise, we run dexdump on each of the dex files.
+      if (dexEntries.size() == 1) {
+        dexDumpFiles.add(runDexDump(new File(apkPath).getCanonicalPath()));
+      } else {
+        for (String dex : getDexesFrom(apk, dexEntries)) {
+          dexDumpFiles.add(runDexDump(dex));
+        }
+      }
+      return dexDumpFiles;
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  @VisibleForTesting
+  List<String> getDexesFrom(final ZipFile apk, FluentIterable<ZipEntry> dexFiles)
+      throws IOException {
+    return dexFiles
+        .transform(
+            new Function<ZipEntry, String>() {
+              @Override
+              public String apply(ZipEntry entry) {
+                try {
+                  File dexFile = environment.createTempFile("target", entry.getName());
+                  Files.copy(
+                      apk.getInputStream(entry),
+                      dexFile.toPath(),
+                      StandardCopyOption.REPLACE_EXISTING);
+                  return dexFile.getPath();
+                } catch (IOException e) {
+                  throw new RuntimeException(e);
+                }
+              }
+            })
+        .toList();
+  }
+
+  private static FluentIterable<ZipEntry> entries(final ZipFile file) {
+    checkNotNull(file);
+    return new FluentIterable<ZipEntry>() {
+      @Override
+      public Iterator<ZipEntry> iterator() {
+        return (Iterator<ZipEntry>) Iterators.forEnumeration(file.entries());
+      }
+    };
+  }
+  // */
+
+  @VisibleForTesting
+  static FluentIterable<ZipEntry> listDexFilesFrom(ZipFile apk) {
+    return entries(apk)
+        .filter(
+            new Predicate<ZipEntry>() {
+              @Override
+              public boolean apply(ZipEntry input) {
+                return input.getName().startsWith("classes") && input.getName().endsWith(".dex");
+              }
+            });
+  }
+
+  /**
+   * Indicates whether or not a given android package is present in the test repo.
+   *
+   * @param androidPackage the package name from the AndroidManifest.xml file
+   */
+  public boolean containsInfoForPackage(String androidPackage) {
+    maybeInitializeRepo();
+    return packageNameToApkPath.containsKey(androidPackage);
+  }
+
+  /**
+   * Returns the apk path for the given android package.
+   */
+  public String getApkPathForPackage(String androidPackage) {
+    checkState(containsInfoForPackage(androidPackage), "Unknown package: %s", androidPackage);
+    return packageNameToApkPath.get(androidPackage);
+  }
+
+  /**
+   * Returns {@code true} if the instrumentation (may include both the app under test as well as the
+   * test apk) with the given package contains the given class name.
+   */
+  public boolean targetContainsClass(String androidPackage, String fullClassName) {
+    checkState(containsInfoForPackage(androidPackage), "Unknown package: %s", androidPackage);
+    ImmutableSet<String> allClasses = targetToClasses.get(androidPackage);
+    return allClasses.contains(fullClassName);
+  }
+
+  /**
+   * Adds an apk to the repository of test information.
+   *
+   * Note: this method is cheap, it doesnt actually scan the apk for tests when invoked, it just
+   * extracts the android package name from the AndroidManifest.xml
+   */
+  @VisibleForTesting
+  void addApkToRepository(File apk) {
+    checkNotNull(apk);
+    packageNameToApkPath.put(apkPathToPackageNameCache.getUnchecked(apk.getPath()), apk.getPath());
+  }
+
+  private synchronized void maybeInitializeRepo() {
+    if (!initialized.get()) {
+      for (String apk : initialApks) {
+        addApkToRepository(new File(apk));
+      }
+      for (String apk : systemApks) {
+        addApkToRepository(new File(apk));
+      }
+      initialized.set(true);
+    }
+  }
+
+  private String [] getDumpArgs(String targetFile) {
+    String [] args = {dexdumpPath, "-a", "-l", "xml", targetFile};
+    return args;
+  }
+
+  private InputStream runDexDump(String targetFile) {
+    try {
+      File dumpOutput = environment.createTempFile("dex-dump", ".xml");
+
+      CommandResult dumpCommand = new Command(getDumpArgs(targetFile))
+          .execute(
+              new ByteArrayInputStream(Command.NO_INPUT),
+              Command.NO_OBSERVER,
+              new BufferedOutputStream(new FileOutputStream(dumpOutput), BUFF_SIZE),
+              new FileOutputStream("/dev/null"));
+      checkState(dumpCommand.getTerminationStatus().success(), "dump apk failed");
+      ModernDexDumpOutputNormalizer.normalize(dumpOutput);
+      return new BufferedInputStream(new FileInputStream(dumpOutput), BUFF_SIZE);
+    } catch (IOException|CommandException e) {
+      throw new RuntimeException(e);
+    }
+  }
+}
diff --git a/android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/broker/shell/BUILD.bazel b/android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/broker/shell/BUILD.bazel
new file mode 100644
index 000000000..910f72ee0
--- /dev/null
+++ b/android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/broker/shell/BUILD.bazel
@@ -0,0 +1,15 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
+licenses(["notice"])  # Apache 2.0
+
+java_library(
+    name = "shell",
+    srcs = glob(["*.java"]),
+    visibility = [
+        "//tools/device_broker/java/com/google/android/apps/common/testing/broker:__pkg__",
+        "//tools/device_broker/javatests/com/google/android/apps/common/testing/broker/shell:__pkg__",
+    ],
+    deps = [
+        "@maven//:com_google_guava_guava",
+    ],
+)
diff --git a/android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/suite/AndroidDeviceTestSuite.java b/android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/suite/AndroidDeviceTestSuite.java
new file mode 100644
index 000000000..f6c24c86e
--- /dev/null
+++ b/android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/suite/AndroidDeviceTestSuite.java
@@ -0,0 +1,253 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.apps.common.testing.suite;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.beust.jcommander.JCommander;
+import com.beust.jcommander.Parameter;
+import com.google.android.apps.common.testing.broker.AdbController;
+import com.google.android.apps.common.testing.broker.BrokeredDevice;
+import com.google.android.apps.common.testing.broker.DeviceBroker;
+import com.google.android.apps.common.testing.broker.DeviceBrokerFactory;
+import com.google.android.apps.common.testing.broker.Instrumentation;
+import com.google.android.apps.common.testing.proto.TestInfo.InfoPb;
+import com.google.android.apps.common.testing.proto.TestInfo.TestSuitePb;
+import com.google.android.apps.common.testing.suite.filter.Filters;
+import com.google.android.apps.common.testing.testrunner.testsuitepbutil.TestSuitePbUtil;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Joiner;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import junit.framework.TestCase;
+import junit.framework.TestResult;
+import junit.framework.TestSuite;
+
+// For Copybara OSS
+import java.util.Arrays;
+// */
+
+/**
+ * Skeleton implementation of the Android Device test suite.
+ *
+ * <p>This will interrogate a device for tests to run, create test cases representing those tests
+ * and execute them.
+ */
+public class AndroidDeviceTestSuite {
+
+  private static final Logger logger = Logger.getLogger(AndroidGoogleTest.class.getName());
+  private static final String DEFAULT_STACK_TRACE_FILE = "/data/anr/traces.txt";
+
+  public static TestSuite suite() {
+    String argvFromEnv = System.getProperty("argv");
+    String[] cleanedFlags =
+        Arrays.stream(argvFromEnv.split(" |="))
+            .map(s -> s.replaceAll("^\"|\"$", ""))
+            .toArray(String[]::new);
+    return new Builder().withCommandLineArgs(cleanedFlags).build();
+    // */
+  }
+
+  static class Builder {
+    private TestArgs testArgs = new TestArgs();
+    private DeviceBroker baseBroker = null;
+    private boolean allowEmptySuite = testArgs.havingNoTestsToRunIsFineWithMe;
+    private AndroidTestHarness androidTestHarness = new NoopAndroidTestHarness();
+    private String[] commandLineArgs = {};
+    private BrokeredDevice brokeredDevice;
+
+    public Builder withAllowEmptySuite(boolean allow) {
+      allowEmptySuite = allow;
+      return this;
+    }
+
+    public Builder withBaseDeviceBroker(DeviceBroker baseBroker) {
+      this.baseBroker = baseBroker;
+      return this;
+    }
+
+    public Builder withAndroidTestHarness(AndroidTestHarness androidTestHarness) {
+      this.androidTestHarness = androidTestHarness;
+      return this;
+    }
+
+    @VisibleForTesting
+    DeviceBroker makeDeviceBroker() {
+      if (null == baseBroker) {
+        baseBroker = DeviceBrokerFactory.getInstance(commandLineArgs);
+      }
+      return baseBroker;
+    }
+
+    public TestSuite build() {
+      TestSuite rootSuite = new TestSuite();
+      final DeviceBroker myBroker = makeDeviceBroker();
+      try {
+        rootSuite.addTest(makeNativeTestSuite(myBroker));
+      } catch (RuntimeException re) {
+        logger.log(Level.WARNING, "AndroidDeviceTestSuite Native suite creation failed!");
+        if (null != brokeredDevice) {
+          myBroker.freeDevice(brokeredDevice);
+        }
+        throw re;
+      }
+      return new TestSuiteWrapper(rootSuite) {
+        @Override
+        public void run(TestResult testResult) {
+          androidTestHarness.beforeAllTests();
+          try {
+            super.run(testResult);
+          } finally {
+            androidTestHarness.afterAllTests();
+            myBroker.freeDevice(brokeredDevice);
+          }
+        }
+      };
+    }
+
+    Builder withCommandLineArgs(String[] args) {
+      JCommander jCommander = new JCommander(testArgs);
+      jCommander.setAcceptUnknownOptions(true);
+      jCommander.parse(args);
+      this.allowEmptySuite = testArgs.havingNoTestsToRunIsFineWithMe;
+      this.commandLineArgs = args;
+      return this;
+    }
+
+    TestSuite makeNativeTestSuite(DeviceBroker myBroker) {
+      List<InfoPb> nativeTestList;
+      Map<String, String> deviceEnvVars;
+      String externalStorageDirectory;
+      String stackTraceFile;
+      Instrumentation testInstrumentation;
+      brokeredDevice = myBroker.leaseDevice();
+
+      AdbController controller = brokeredDevice.getAdbController();
+      testInstrumentation = controller.getGoogleTestInstrumentation();
+      deviceEnvVars = brokeredDevice.getShellVariables();
+      externalStorageDirectory = deviceEnvVars.get("EXTERNAL_STORAGE");
+      stackTraceFile = controller.getDeviceProperties().get("dalvik.vm.stack-trace-file");
+      if (stackTraceFile == null) {
+        stackTraceFile = DEFAULT_STACK_TRACE_FILE;
+      }
+      checkNotNull(externalStorageDirectory, "No external storage on device? %s", deviceEnvVars);
+      nativeTestList = listTests(brokeredDevice, controller, testInstrumentation);
+
+      TestSuite nativeSuiteRoot = new TestSuite();
+
+      TestSuite testSubPackageSuite = null;
+      String curPackageName = null;
+      TestSuite testClassSuite = null;
+      String curClassName = null;
+
+      try {
+        for (InfoPb testInfo : nativeTestList) {
+          System.out.println(testInfo);
+          if (!testInfo.getTestPackage().equals(curPackageName)) {
+            curPackageName = testInfo.getTestPackage();
+            testSubPackageSuite = new TestSuite(curPackageName);
+            nativeSuiteRoot.addTest(testSubPackageSuite);
+          }
+
+          if (!testInfo.getTestClass().equals(curClassName)) {
+            curClassName = testInfo.getTestClass();
+            testClassSuite = new TestSuite(curClassName);
+            testSubPackageSuite.addTest(testClassSuite);
+          }
+
+          AndroidGoogleTest test =
+              new AndroidGoogleTest.Builder()
+                  .withTestInfo(testInfo)
+                  .withBrokeredDevice(brokeredDevice)
+                  .withInstrumentation(testInstrumentation)
+                  .withExternalStorageDirectory(externalStorageDirectory)
+                  .withStackTraceFile(stackTraceFile)
+                  .withCommandLineArgs(commandLineArgs)
+                  .withAndroidTestHarness(androidTestHarness)
+                  .build();
+
+          testClassSuite.addTest(test);
+        }
+      } catch (RuntimeException re) {
+        throw new RuntimeException(
+            "Failed to create tests for given list of methods:\n"
+                + Joiner.on("\n").join(TestSuitePbUtil.getCanonicalTestMethods(nativeTestList)),
+            re);
+      }
+      if (nativeTestList.isEmpty() && !allowEmptySuite) {
+        nativeSuiteRoot.addTestSuite(EmptyTestSuiteTest.class);
+      }
+
+      return nativeSuiteRoot;
+    }
+
+    List<InfoPb> listTests(
+        BrokeredDevice brokeredDevice,
+        AdbController controller,
+        Instrumentation testInstrumentation) {
+      TestSuitePb testSuite = controller.getTestMethods(testInstrumentation);
+      List<InfoPb> sortedTests = TestSuitePbUtil.sortTestSuite(testSuite).getInfoList();
+      List<InfoPb> filteredTests = Lists.newArrayList();
+      for (InfoPb testInfo : sortedTests) {
+        if (filteredTests.isEmpty()) {
+          filteredTests.add(testInfo);
+        } else {
+          InfoPb previousTest = filteredTests.get(filteredTests.size() - 1);
+
+          if (!TestSuitePbUtil.getCanonicalTestMethod(previousTest)
+              .equals(TestSuitePbUtil.getCanonicalTestMethod(testInfo))) {
+            filteredTests.add(testInfo);
+          }
+        }
+      }
+      return Lists.newArrayList(
+          Iterables.filter(
+              filteredTests,
+              Filters.getTestFilter(commandLineArgs).createTestFilterPredicateFor(brokeredDevice)));
+    }
+
+    static class TestArgs {
+      @Parameter(
+          names = "--having_no_tests_to_run_is_fine_with_me",
+          description = "Allows a test suite to pass if it has no tests to run.")
+      public boolean havingNoTestsToRunIsFineWithMe = false;
+    }
+
+    /** A test case to signal the empty suite. */
+    public static class EmptyTestSuiteTest extends TestCase {
+
+      public void testSuiteIsEmpty() {
+        fail(
+            "The test suite has no tests cases in it. Some reasons for this may be: "
+                + "overly aggressive test filtering, multiple APK files with the same "
+                + "package name in their android manifest, tting to annotate test "
+                + "methods with @Test, or a typo in your junit3 test method name. "
+                + "\n\nIf you have a valid reason to run a test target with no tests "
+                + "in it, add  "
+                + "--having_no_tests_to_run_is_fine_with_me "
+                + "to your android_test's args attribute.\n "
+                + "Please, do not add this argument just to get tests to pass "
+                + "only add it if there is a good reason to not have tests in this "
+                + "suite.");
+      }
+    }
+  }
+}
diff --git a/android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/suite/BUILD.bazel b/android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/suite/BUILD.bazel
new file mode 100644
index 000000000..e13d46b55
--- /dev/null
+++ b/android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/suite/BUILD.bazel
@@ -0,0 +1,59 @@
+# Description:
+#  Entry-point test suite used for Android Tests
+load("@rules_java//java:defs.bzl", "java_library", "java_test")
+
+licenses(["notice"])  # Apache 2.0
+
+ANDROID_TEST_HARNESS_SRCS = [
+    "AndroidTestHarness.java",
+]
+
+java_library(
+    name = "suite",
+    testonly = 1,
+    srcs = glob(
+        ["*.java"],
+        exclude = ANDROID_TEST_HARNESS_SRCS,
+    ),
+    visibility = ["//visibility:public"],
+    deps = [
+        ":test_controller",
+        "//tools/device_broker/java/com/google/android/apps/common/testing/broker:broker_factory",
+        "//tools/device_broker/java/com/google/android/apps/common/testing/broker:broker_intf",
+        "//tools/device_broker/java/com/google/android/apps/common/testing/broker:shared_constants",
+        "//tools/device_broker/java/com/google/android/apps/common/testing/broker:struct",
+        "//tools/device_broker/java/com/google/android/apps/common/testing/suite/filter",
+        "//tools/device_broker/java/com/google/android/apps/common/testing/testrunner/testsuitepbutil",
+        "//tools/device_broker/proto:test_info_pb_java_proto",
+        "@maven//:com_beust_jcommander",
+        "@maven//:com_google_code_findbugs_jsr305",
+        "@maven//:com_google_guava_guava",
+        "@maven//:junit_junit",
+    ],
+)
+
+java_library(
+    name = "exceptions",
+    testonly = 1,
+    srcs = ["SuiteCreationFailureException.java"],
+    visibility = ["//visibility:public"],
+    deps = ["@maven//:com_google_code_findbugs_jsr305"],
+)
+
+java_test(
+    name = "entry_point",
+    testonly = 1,
+    tags = ["manual"],
+    test_class = "com.google.android.apps.common.testing.suite.AndroidDeviceTestSuite",
+    visibility = ["//visibility:public"],
+    runtime_deps = [
+        ":suite",
+    ],
+)
+
+java_library(
+    name = "test_controller",
+    testonly = 1,
+    srcs = ANDROID_TEST_HARNESS_SRCS,
+    deps = ["//tools/device_broker/java/com/google/android/apps/common/testing/broker:broker_intf"],
+)
diff --git a/android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/suite/dex/BUILD.bazel b/android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/suite/dex/BUILD.bazel
new file mode 100644
index 000000000..9c44f3e62
--- /dev/null
+++ b/android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/suite/dex/BUILD.bazel
@@ -0,0 +1,17 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
+licenses(["notice"])  # Apache 2.0
+
+java_library(
+    name = "dex",
+    srcs = glob(["*.java"]),
+    visibility = [
+        "//tools/device_broker/java/com/google/android/apps/common/testing:__subpackages__",
+    ],
+    deps = [
+        "//opensource/auto_value",
+        "//tools/device_broker/proto:test_info_pb_java_proto",
+        "@maven//:com_google_code_findbugs_jsr305",
+        "@maven//:com_google_guava_guava",
+    ],
+)
diff --git a/android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/suite/filter/AnnotationPredicates.java b/android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/suite/filter/AnnotationPredicates.java
new file mode 100644
index 000000000..e5f0714e7
--- /dev/null
+++ b/android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/suite/filter/AnnotationPredicates.java
@@ -0,0 +1,212 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.apps.common.testing.suite.filter;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.base.Predicates.alwaysTrue;
+import static com.google.common.base.Predicates.or;
+
+import com.google.android.apps.common.testing.proto.TestInfo.AnnotationPb;
+import com.google.android.apps.common.testing.proto.TestInfo.AnnotationValuePb;
+import com.google.android.apps.common.testing.proto.TestInfo.InfoPb;
+import com.google.common.base.Predicate;
+import com.google.common.collect.Sets;
+import java.lang.annotation.ElementType;
+import java.util.List;
+import java.util.Set;
+
+/** Helper functions for creating predicates on annotations in InfoPbs. */
+public final class AnnotationPredicates {
+
+  private AnnotationPredicates() {}
+
+  static final Predicate<List<AnnotationValuePb>> PERMISSIVE = alwaysTrue();
+
+  static Predicate<InfoPb> newMethodAnnotationPresentPredicate(
+      String annotationClassName, Predicate<List<AnnotationValuePb>> valuePredicate) {
+    return new AnnotationPresent(ElementType.METHOD, annotationClassName, valuePredicate);
+  }
+
+  static Predicate<InfoPb> newClassAnnotationPresentPredicate(
+      String annotationClassName, Predicate<List<AnnotationValuePb>> valuePredicate) {
+    return new AnnotationPresent(ElementType.TYPE, annotationClassName, valuePredicate);
+  }
+
+  static Predicate<InfoPb> newAnnotationPresentAnywherePredicate(
+      String annotationClassName, Predicate<List<AnnotationValuePb>> valuePredicate) {
+    return or(
+        newMethodAnnotationPresentPredicate(annotationClassName, valuePredicate),
+        newClassAnnotationPresentPredicate(annotationClassName, valuePredicate));
+  }
+
+  public static Predicate<InfoPb> newAnnotationPresentAnywherePredicate(
+      String annotationClassName) {
+    return newAnnotationPresentAnywherePredicate(annotationClassName, PERMISSIVE);
+  }
+
+  /**
+   * Takes a predicate that was written to handle a single AnnotationValuePb with a specific field
+   * name and converts it so that it can be applied to a list of annovaluepbs and will only be
+   * called on its specific field.
+   *
+   * @param fieldName the field name the predicate should apply against.
+   * @param valuePredicate the predicate to apply to the AnnotationValuePb with the above fileld
+   *     name.
+   */
+  static Predicate<List<AnnotationValuePb>> applyValuePredicateToSpecificField(
+      final String fieldName, final Predicate<AnnotationValuePb> valuePredicate) {
+    checkNotNull(fieldName);
+    checkNotNull(valuePredicate);
+    return annoValues -> {
+      for (AnnotationValuePb annoValue : annoValues) {
+        if (annoValue.getFieldName().equals(fieldName)) {
+          return valuePredicate.apply(annoValue);
+        }
+      }
+      throw new IllegalStateException(
+          String.format("Expected to find fieldname: %s in %s.", fieldName, annoValues));
+    };
+  }
+
+  /**
+   * Creates a predicate that returns true if the annotation's value is equal to the expected value.
+   *
+   * <p>If the field is an array field, the predicate will throw an exception.
+   *
+   * <p>Example: @FooBar(blah=42)
+   *
+   * <p>applyValuePredicateToSpecificField("blah", fieldValueEquals("42"))
+   *
+   * <p>Would return true.
+   *
+   * @param expectedValue the desired value.
+   */
+  static Predicate<AnnotationValuePb> fieldValueEquals(final String expectedValue) {
+    checkNotNull(expectedValue);
+
+    return new Predicate<AnnotationValuePb>() {
+      @Override
+      public boolean apply(AnnotationValuePb annoValue) {
+        checkState(!annoValue.getIsArray(), "This predicate is not appropriate for arrays!");
+        return expectedValue.equals(annoValue.getFieldValue(0));
+      }
+    };
+  }
+
+  /**
+   * Creates a predicate that returns true if the annotation's value as an int is greater than the
+   * given value.
+   *
+   * <p>If the field is an array field, the predicate will throw an exception.
+   *
+   * <p>Example: @FooBar(blah=42)
+   *
+   * <p>applyValuePredicateToSpecificField("blah", fieldValueGreaterThan(41))
+   *
+   * <p>would return true.
+   *
+   * @param value the desired value.
+   */
+  static Predicate<AnnotationValuePb> fieldIntValueGreaterThan(final int value) {
+    return new Predicate<AnnotationValuePb>() {
+      @Override
+      public boolean apply(AnnotationValuePb annoValue) {
+        checkState(!annoValue.getIsArray(), "This predicate is not appropriate for arrays!");
+        String fieldValue = annoValue.getFieldValue(0);
+        checkState(annoValue.getFieldValueCount() > 0, "Expected field value.");
+        try {
+          int fieldIntValue = Integer.parseInt(fieldValue);
+          return fieldIntValue > value;
+        } catch (NumberFormatException e) {
+          throw new IllegalStateException(
+              String.format("Expected integer for field value: %s.", fieldValue));
+        }
+      }
+    };
+  }
+
+  /**
+   * Creates a predicate that returns true if the annotation's value field contains a particular
+   * value.
+   *
+   * <p>The predicate will throw an exception if the field is not an array type.
+   *
+   * <p>Example: @FooBar(blah=[21,11,23, 42])
+   *
+   * <p>applyValuePredicateToSpecificField("blah", fieldValueContainsElement("42"))
+   *
+   * <p>Would return true.
+   *
+   * @param expectedValue the desired value.
+   */
+  static Predicate<AnnotationValuePb> fieldValueContainsElement(final String expectedValue) {
+    checkNotNull(expectedValue);
+
+    return new Predicate<AnnotationValuePb>() {
+      @Override
+      public boolean apply(AnnotationValuePb annoValue) {
+        checkState(annoValue.getIsArray(), "This predicate only appropriate for arrays!");
+        return annoValue.getFieldValueList().contains(expectedValue);
+      }
+    };
+  }
+
+  private static class AnnotationPresent implements Predicate<InfoPb> {
+    private static final Set<ElementType> VALID_LOCATIONS =
+        Sets.newHashSet(ElementType.METHOD, ElementType.TYPE);
+
+    private final ElementType checkLocation;
+    private final String className;
+    private final Predicate<List<AnnotationValuePb>> valuePredicate;
+
+    AnnotationPresent(
+        ElementType checkLocation,
+        String className,
+        Predicate<List<AnnotationValuePb>> valuePredicate) {
+      checkArgument(
+          VALID_LOCATIONS.contains(checkLocation),
+          "%s is not valid - must be %s",
+          checkLocation,
+          VALID_LOCATIONS);
+      this.checkLocation = checkLocation;
+      this.className = checkNotNull(className);
+      this.valuePredicate = checkNotNull(valuePredicate);
+    }
+
+    @Override
+    public boolean apply(InfoPb info) {
+      if (ElementType.METHOD == checkLocation) {
+        return apply(info.getMethodAnnotationList());
+      } else {
+        return apply(info.getClassAnnotationList());
+      }
+    }
+
+    private boolean apply(List<AnnotationPb> annos) {
+      for (AnnotationPb anno : annos) {
+        if (anno.getClassName().equals(className)) {
+          if (valuePredicate.apply(anno.getAnnotationValueList())) {
+            return true;
+          }
+        }
+      }
+      return false;
+    }
+  }
+}
diff --git a/android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/suite/filter/BUILD.bazel b/android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/suite/filter/BUILD.bazel
new file mode 100644
index 000000000..c11556960
--- /dev/null
+++ b/android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/suite/filter/BUILD.bazel
@@ -0,0 +1,20 @@
+# Description:
+#   Classes related to filter test cases to run.
+load("@rules_java//java:defs.bzl", "java_library")
+
+licenses(["notice"])  # Apache 2.0
+
+java_library(
+    name = "filter",
+    testonly = 1,
+    srcs = glob(["*.java"]),
+    visibility = ["//visibility:public"],
+    deps = [
+        "//tools/device_broker/java/com/google/android/apps/common/testing/broker:broker_intf",
+        "//tools/device_broker/java/com/google/android/apps/common/testing/suite:exceptions",
+        "//tools/device_broker/proto:test_info_pb_java_proto",
+        "@maven//:com_beust_jcommander",
+        "@maven//:com_google_guava_guava",
+        "@maven//:junit_junit",
+    ],
+)
diff --git a/android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/testrunner/testsuitepbutil/BUILD.bazel b/android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/testrunner/testsuitepbutil/BUILD.bazel
new file mode 100644
index 000000000..e9c974416
--- /dev/null
+++ b/android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/java/com/google/android/apps/common/testing/testrunner/testsuitepbutil/BUILD.bazel
@@ -0,0 +1,22 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
+# -*- mode: python; -*-
+#
+# Description:
+#   Utility classes for TestSuitePb manipulation
+#
+licenses(["notice"])  # Apache 2.0
+
+package(
+    default_visibility = ["//visibility:public"],
+)
+
+java_library(
+    name = "testsuitepbutil",
+    testonly = 1,
+    srcs = glob(["*.java"]),
+    deps = [
+        "//tools/device_broker/proto:test_info_pb_java_proto",
+        "@maven//:com_google_guava_guava",
+    ],
+)
diff --git a/android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/proto/BUILD.bazel b/android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/proto/BUILD.bazel
new file mode 100644
index 000000000..3b204ccd7
--- /dev/null
+++ b/android/instrumentation-testing/third_party/android-test/overlay/tools/device_broker/proto/BUILD.bazel
@@ -0,0 +1,36 @@
+# Copyright 2017 Google Inc. All Rights Reserved.
+#
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+load("@protobuf//bazel:java_proto_library.bzl", "java_proto_library")
+load("@protobuf//bazel:proto_library.bzl", "proto_library")
+
+package(
+    default_visibility = [
+        "//tools/android/proto:__pkg__",
+        "//tools/device_broker:__subpackages__",
+    ],
+)
+
+licenses(["notice"])  # Apache 2.0
+
+proto_library(
+    name = "test_info_pb",
+    srcs = ["test_info.proto"],
+)
+
+java_proto_library(
+    name = "test_info_pb_java_proto",
+    deps = [":test_info_pb"],
+)
diff --git a/android/instrumentation-testing/third_party/android-test/repository.bzl b/android/instrumentation-testing/third_party/android-test/repository.bzl
new file mode 100644
index 000000000..8b7088df3
--- /dev/null
+++ b/android/instrumentation-testing/third_party/android-test/repository.bzl
@@ -0,0 +1,67 @@
+_MAX_OVERLAY_DIRECTORIES = 1000
+
+def _dirname(path):
+    index = path.rfind("/")
+    if index == -1:
+        return ""
+    return path[:index]
+
+def _ensure_parent_directory(repository_ctx, path):
+    parent = _dirname(path)
+    if not parent:
+        return
+
+    marker = parent + "/.android_test_overlay_dir"
+    repository_ctx.file(marker, "", executable = False)
+    repository_ctx.delete(marker)
+
+def _collect_overlay_files(path):
+    files = []
+    directories = [(path, "")]
+
+    for _ in range(_MAX_OVERLAY_DIRECTORIES):
+        if not directories:
+            return files
+
+        directory, directory_relative_path = directories.pop()
+        for entry in directory.readdir():
+            child_relative_path = entry.basename if not directory_relative_path else directory_relative_path + "/" + entry.basename
+            if entry.is_dir:
+                directories.append((entry, child_relative_path))
+            else:
+                files.append((entry, child_relative_path))
+
+    fail("AndroidX Test overlay has more than %d directories" % _MAX_OVERLAY_DIRECTORIES)
+
+def _apply_overlay(repository_ctx, overlay_path):
+    repository_ctx.watch_tree(overlay_path)
+
+    for src, overlay_file in _collect_overlay_files(overlay_path):
+        _ensure_parent_directory(repository_ctx, overlay_file)
+        repository_ctx.delete(overlay_file)
+        repository_ctx.symlink(src, overlay_file)
+
+def _android_test_repository_impl(repository_ctx):
+    repository_ctx.download_and_extract(
+        url = repository_ctx.attr.urls,
+        output = ".",
+        integrity = repository_ctx.attr.integrity,
+        strip_prefix = repository_ctx.attr.strip_prefix,
+    )
+
+    overlay_workspace = repository_ctx.path(repository_ctx.attr._overlay_anchor).dirname
+    overlay_path = overlay_workspace.get_child("overlay")
+    _apply_overlay(repository_ctx, overlay_path)
+
+android_test_repository = repository_rule(
+    implementation = _android_test_repository_impl,
+    attrs = {
+        "_overlay_anchor": attr.label(default = Label("//:MODULE.bazel")),
+        "integrity": attr.string(default = "sha256-Jei48zc6cKQi2O8WXdYG2x6phF1cY2269neIpI0Wqf0="),
+        "strip_prefix": attr.string(default = "android-test-114487817b0da655a06f0b479c3f9cb3006a5af6"),
+        "urls": attr.string_list(default = [
+            "https://github.com/android/android-test/archive/114487817b0da655a06f0b479c3f9cb3006a5af6.tar.gz",
+        ]),
+    },
+    local = True,
+)

From a84be2fc6eae2181228da25e821a327c0b045314 Mon Sep 17 00:00:00 2001
From: Byoungchan Lee <byoungchan.lee@gmx.com>
Date: Thu, 30 Apr 2026 21:16:28 +0900
Subject: [PATCH 3/3] android-instrumentation-testing: Add README.md

---
 android/instrumentation-testing/README.md | 63 +++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 android/instrumentation-testing/README.md

diff --git a/android/instrumentation-testing/README.md b/android/instrumentation-testing/README.md
new file mode 100644
index 000000000..7e00194f9
--- /dev/null
+++ b/android/instrumentation-testing/README.md
@@ -0,0 +1,63 @@
+# Android Instrumentation Testing with Bazel
+
+This sample builds a small Java Android app and runs an AndroidX/JUnit4
+instrumentation test on a connected local device.
+
+## Run
+
+Point Bazel at an Android SDK:
+
+```shell
+export ANDROID_HOME=/path/to/android/sdk
+```
+
+Alternatively, keep the SDK path in `.bazelrc.user`:
+
+```text
+common --repo_env=ANDROID_HOME=/path/to/android/sdk
+```
+
+Build the app and instrumentation APK:
+
+```shell
+bazel build //app/src/main:greeter_test_app
+```
+
+Run the device test:
+
+```shell
+bazel test //app/src/main:greeter_instrumentation_test \
+  --config=local_device \
+  --nocache_test_results
+```
+
+`--config=local_device` uses the local adb server and runs the test
+exclusively. `adb devices` should show one usable device; for multiple devices,
+pass an explicit serial with `--test_arg=--device_serial_number=<serial>`.
+Use either an emulator or a real device that is already running; this sample
+does not create or manage an emulator.
+
+## Approach
+
+The sample uses a small Starlark rule in `bazel/android_instrumentation_test.bzl`
+to connect `rules_android` APK providers to AndroidX Test's host-side runner.
+The rule adds the target APK, instrumentation APK, and runner to runfiles, and
+leaves device selection to the `local_device` Bazel config.
+
+AndroidX Test support is vendored as a separate module in
+`third_party/android-test`. The root module reaches it through
+`local_path_override` and a module extension that creates
+`@android_test_support`. Keeping this as a separate module avoids putting the
+AndroidX Test dependency graph and overrides directly in the sample module.
+
+The AndroidX Test repository is generated from an upstream source archive plus
+the local `third_party/android-test/overlay` tree. The overlay replaces selected
+BUILD files with Bzlmod-compatible labels and carries the small local-device
+patches needed for retail devices. It also patches AndroidX Test's host-side
+test discovery to use the Android SDK `dexdump` from `@androidsdk//:dexdump`
+with modern SDK arguments, instead of falling back to AndroidX Test's embedded
+Linux `dexdump_annotations` binary.
+
+`.bazelignore` excludes the overlay from normal package discovery because those
+BUILD files are intended for the generated `@android_test_support` repository,
+not the root sample workspace.