Merge Android Pie into master

Bug: 112104996
Change-Id: I0f6f7aa7c077f35e5ef70e8aa54171b2d8d2b784
diff --git a/Android.mk b/Android.mk
index 04d88be..632286d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -10,7 +10,7 @@
 
 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