Merge ab/AP4A.241205.013 into aosp-main-future

Bug: 370570306
Merged-In: I413de81a0ea55ef7fe12be9df9f522e0c6b56513
Change-Id: I840dbb05e3f13fa3b69245ea2b53b1df76e0bf87

.prebuilt_info/prebuilt_info_current_current_zip.asciipb

 drops {
   android_build_drop {
-    build_id: "12373408"
+    build_id: "12509279"
     target: "train_build"
     source_file: "mainline-sdks/for-latest-build/current/com.google.android.os.statsd/sdk/statsd-module-sdk-current.zip"
   }

current/Android.bp

@@ -106,7 +106,7 @@ cc_prebuilt_library_shared {
         "test_com.android.os.statsd",
     ],
     licenses: ["statsd-module-sdk_Android-Apache-2.0"],
-    stl: "libc++_static",
+    stl: "none",
     compile_multilib: "both",
     export_include_dirs: ["include/packages/modules/StatsD/lib/libstatspull/include"],
     stubs: {
@@ -129,6 +129,9 @@ cc_prebuilt_library_shared {
             srcs: ["x86/lib/libstatspull.so"],
         },
     },
+    strip: {
+        none: true,
+    },
 }
 
 cc_prebuilt_library_shared {
@@ -139,7 +142,7 @@ cc_prebuilt_library_shared {
         "test_com.android.os.statsd",
     ],
     licenses: ["statsd-module-sdk_Android-Apache-2.0"],
-    stl: "libc++_static",
+    stl: "none",
     compile_multilib: "both",
     export_include_dirs: ["include/packages/modules/StatsD/lib/libstatssocket/include"],
     stubs: {
@@ -162,6 +165,9 @@ cc_prebuilt_library_shared {
             srcs: ["x86/lib/libstatssocket.so"],
         },
     },
+    strip: {
+        none: true,
+    },
 }
 
 prebuilt_systemserverclasspath_fragment {

current/include/packages/modules/StatsD/lib/libstatssocket/include/stats_event.h

@@ -42,6 +42,14 @@
  * order that they are defined in the atom.
  */
 
+#ifndef __ANDROID_API_T__
+#define __ANDROID_API_T__ 33
+#endif
+
+#ifndef __INTRODUCED_IN
+#define __INTRODUCED_IN(api_level)
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif  // __CPLUSPLUS

current/snapshot-creation-build-number.txt

-12123081
\ No newline at end of file
+12279057
\ No newline at end of file