Revert "Connectivity: Depend on new httpclient targets"

Revert submission 2647150-httpclient-wrapper

Reason for revert: ndk build break (b/291449552)

Reverted changes: /q/submissionid:2647150-httpclient-wrapper

Change-Id: Ic90a625d105e8ad310eb93758a776ff5b764f67a
diff --git a/framework/Android.bp b/framework/Android.bp
index cab11ae..123f02a 100644
--- a/framework/Android.bp
+++ b/framework/Android.bp
@@ -109,8 +109,8 @@
         "framework-connectivity-defaults",
     ],
     static_libs: [
-        "httpclient_api",
-        "httpclient_impl",
+        "cronet_aml_api_java",
+        "cronet_aml_java",
     ],
     libs: [
         // This cannot be in the defaults clause above because if it were, it would be used
@@ -125,12 +125,12 @@
 
 java_defaults {
     name: "CronetJavaDefaults",
-    srcs: [":httpclient_api_sources"],
+    srcs: [":cronet_aml_api_sources"],
     libs: [
         "androidx.annotation_annotation",
     ],
     impl_only_static_libs: [
-        "httpclient_impl",
+        "cronet_aml_java",
     ],
 }