Remove explicit dependencies on "core" libraries

The dependencies are unnecessary since bouncycastle
and conscrypt are included in the "standard libraries".

Test: build
Bug: 113148576
Merged-In: Ic059bd60a7e34550ff65d6226d65b70ee52c6bc8
Change-Id: Ic059bd60a7e34550ff65d6226d65b70ee52c6bc8
diff --git a/service/Android.mk b/service/Android.mk
index 83dc143..2be9239 100644
--- a/service/Android.mk
+++ b/service/Android.mk
@@ -57,8 +57,6 @@
 
 LOCAL_JAVA_LIBRARIES := \
 	android.hidl.manager-V1.0-java \
-	bouncycastle \
-	conscrypt \
 	error_prone_annotations \
 	jsr305 \
 	services
diff --git a/tests/wifitests/Android.mk b/tests/wifitests/Android.mk
index c1082f8..04e09da 100644
--- a/tests/wifitests/Android.mk
+++ b/tests/wifitests/Android.mk
@@ -64,8 +64,7 @@
 	android.test.runner \
 	android.hidl.manager-V1.0-java \
 	android.test.base \
-	android.test.mock \
-	conscrypt
+	android.test.mock
 
 # These must be explicitly included because they are not normally accessible
 # from apps.