Merge "Drop .stubs from android.test.[base|runner|mock].stubs" into rvc-dev-plus-aosp

tests/cts/hostside/app/Android.bp

@@ -28,8 +28,8 @@ android_test_helper_app {
         "CtsHostsideNetworkTestsAidl",
     ],
     libs: [
-        "android.test.runner.stubs",
-        "android.test.base.stubs",
+        "android.test.runner",
+        "android.test.base",
     ],
     srcs: ["src/**/*.java"],
     // Tag this module as a cts test artifact

tests/cts/net/Android.bp

@@ -22,7 +22,7 @@ java_defaults {
     libs: [
         "voip-common",
         "org.apache.http.legacy",
-        "android.test.base.stubs",
+        "android.test.base",
     ],
 
     jni_libs: [

tests/cts/net/api23Test/Android.bp

@@ -20,7 +20,7 @@ android_test {
     compile_multilib: "both",
 
     libs: [
-        "android.test.base.stubs",
+        "android.test.base",
     ],
 
     srcs: [

tests/cts/net/ipsec/Android.bp

@@ -21,7 +21,7 @@ android_test {
 
     libs: [
         "android.net.ipsec.ike.stubs.system",
-        "android.test.base.stubs",
+        "android.test.base",
     ],
 
     srcs: [

tests/cts/tethering/Android.bp

@@ -17,7 +17,7 @@ android_test {
     defaults: ["cts_defaults"],
 
     libs: [
-        "android.test.base.stubs",
+        "android.test.base",
     ],
 
     srcs: [