Revert "Move libstatspull to the apex"

This reverts commit 36f0eeaf10.

Reason for revert: major functional regression
Bug: 149538115
Change-Id: I7cc3c1a62e9d2d0bac7fc77848eeacbf8dc7dbe2

apex/statsd/Android.bp

@@ -20,7 +20,6 @@ apex {
 
 apex_defaults {
     native_shared_libs: [
-        "libstatspull",
         "libstats_jni",
     ],
     // binaries: ["vold"],
@@ -29,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",

apex/statsd/aidl/Android.bp

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