Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master

Bug: 79597307
Change-Id: Iab25f3388fbee53e4be1c6081ce1cefd3f98648a
diff --git a/tck-android/Android.mk b/tck-android/Android.mk
index 3c4e541..877e72b 100644
--- a/tck-android/Android.mk
+++ b/tck-android/Android.mk
@@ -30,6 +30,6 @@
 LOCAL_CERTIFICATE := platform
 
 LOCAL_STATIC_JAVA_LIBRARIES := objenesis-tck junit
-LOCAL_JAVA_LIBRARIES := legacy-android-test
+LOCAL_JAVA_LIBRARIES := android.test.base
 LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java)
 include $(BUILD_PACKAGE)