Merge changes from topic "revert-149538115"

* changes:
  Revert "Move libstatspull to the apex"
  Revert "Move libstatssocket to apex"

apex/statsd/Android.bp

@@ -20,8 +20,6 @@ apex {
 
 apex_defaults {
     native_shared_libs: [
-        "libstatssocket",
-        "libstatspull",
         "libstats_jni",
     ],
     // binaries: ["vold"],
@@ -30,7 +28,6 @@ apex_defaults {
         "service-statsd",
     ],
     // prebuilts: ["my_prebuilt"],
-    compile_multilib: "both",
     name: "com.android.os.statsd-defaults",
     key: "com.android.os.statsd.key",
     certificate: ":com.android.os.statsd.certificate",
@@ -77,4 +74,4 @@ cc_library_shared {
         //TODO (b/148620413): remove platform.
          "//apex_available:platform",
     ],
-}
+}

apex/statsd/aidl/Android.bp

@@ -38,10 +38,6 @@ aidl_interface {
         },
         ndk: {
             enabled: true,
-            apex_available: [
-                "com.android.os.statsd",
-            ],
         }
-
-    },
+    }
 }

cmds/statsd/Android.bp

@@ -120,14 +120,13 @@ cc_defaults {
         "libstatslog",
         "libstatsmetadata",
         "libsysutils",
-	// TODO(b/145923087): move to shared when statsd is moved to the apex
-        "libstatssocket",
         "libutils",
     ],
     shared_libs: [
         "libbinder",
         "libincident",
         "liblog",
+        "libstatssocket",
         "statsd-aidl-cpp",
     ],
 }