Merge Android Pie into masterandroid-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-release

Bug: 112104996
Change-Id: I0f6f7aa7c077f35e5ef70e8aa54171b2d8d2b784

1 files changed, 1 insertions, 1 deletions

diff --git a/Android.mk b/Android.mk
index 04d88be..632286d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -10,7 +10,7 @@ LOCAL_SRC_FILES := \
 
 LOCAL_STATIC_JAVA_LIBRARIES := junit
 
-LOCAL_JAVA_LIBRARIES := legacy-android-test
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
 
 LOCAL_PACKAGE_NAME := Browser2