Prepare for removal of junit and android.test classes from Android API (step 1)

In preparation for removing junit and android.test classes from
the Android API this change adds explicit dependencies on junit
and/or legacy-android-test to ensure that modules will compile
properly once it is removed.

Care was taken to ensure that any targets that depended,
directly or indirectly, on android-support-test did not also
depend on junit or hamcrest as they conflict with the versions
embedded within android-support-test.

Bug: 30188076
Test: make checkbuild
Change-Id: I0cb8c39bdfbefb92db48c30815ee4902d13a3fed
diff --git a/Android.mk b/Android.mk
index 81513d0..d69ca83 100644
--- a/Android.mk
+++ b/Android.mk
@@ -8,6 +8,8 @@
 LOCAL_SRC_FILES := \
         $(call all-java-files-under, src)
 
+LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test junit
+
 LOCAL_PACKAGE_NAME := Browser2
 
 include $(BUILD_PACKAGE)