Merge "Make java_sdk_library dependencies explicit" into main

tests/Enable16KbTests/Android.bp

@@ -34,8 +34,8 @@ android_test {
     platform_apis: true,
     certificate: "platform",
     libs: [
-        "android.test.runner",
+        "android.test.runner.stubs.system",
-        "android.test.base",
+        "android.test.base.stubs.system",
     ],
 }
 

tests/anomaly-tester/Android.bp

@@ -13,7 +13,7 @@ android_test {
 
     certificate: "platform",
 
-    libs: ["android.test.runner"],
+    libs: ["android.test.runner.stubs.system"],
 
     static_libs: [
         "androidx.test.rules",

tests/perftests/Android.bp

@@ -14,7 +14,7 @@ android_test {
     certificate: "platform",
 
     libs: [
-        "android.test.runner",
+        "android.test.runner.stubs.system",
     ],
 
     static_libs: [

tests/robotests/Android.bp

@@ -76,7 +76,7 @@ android_robolectric_test {
     ],
 
     libs: [
-        "android.test.mock",
+        "android.test.mock.impl",
         "ims-common",
     ],
 

tests/screenshot/Android.bp

@@ -66,9 +66,9 @@ android_robolectric_test {
 
     ],
     libs: [
-        "android.test.runner",
+        "android.test.runner.impl",
-        "android.test.base",
+        "android.test.base.impl",
-        "android.test.mock",
+        "android.test.mock.impl",
         "truth",
     ],
 

tests/uitests/Android.bp

@@ -33,8 +33,8 @@ android_test {
     ],
 
     libs: [
-        "android.test.runner",
+        "android.test.runner.stubs.system",
-        "android.test.base",
+        "android.test.base.stubs.system",
     ],
 
     static_libs: [