Use bionic platform headers.

Bug: 130763340

Test: Builds.
Change-Id: I8cabd441431cd357bf2842bb40809db5a3ad171e
Merged-In: I8cabd441431cd357bf2842bb40809db5a3ad171e
(cherry picked from commit 7a3180d3c8)

media/libmedia/Android.bp

@@ -1,10 +1,3 @@
-cc_defaults {
-    name: "libmedia_defaults",
-    include_dirs: [
-        "bionic/libc/private",
-    ],
-}
-
 cc_library_headers {
     name: "libmedia_headers",
     vendor_available: true,
@@ -227,8 +220,6 @@ cc_library_static {
 cc_library {
     name: "libmedia",
 
-    defaults: [ "libmedia_defaults" ],
-
     srcs: [
         "IDataSource.cpp",
         "BufferingSettings.cpp",
@@ -274,6 +265,7 @@ cc_library {
     },
 
     header_libs: [
+        "bionic_libc_platform_headers",
         "libstagefright_headers",
         "media_ndk_headers",
     ],
@@ -339,8 +331,6 @@ cc_library {
 cc_library_static {
     name: "libmedia_player2_util",
 
-    defaults: [ "libmedia_defaults" ],
-
     srcs: [
         "AudioParameter.cpp",
         "BufferingSettings.cpp",

media/libmedia/MediaUtils.cpp

@@ -22,7 +22,7 @@
 #include <sys/resource.h>
 #include <unistd.h>
 
-#include <bionic_malloc.h>
+#include <bionic/malloc.h>
 
 #include "MediaUtils.h"
 

media/utils/Android.bp

@@ -45,10 +45,10 @@ cc_library {
         "-Werror",
     ],
 
-    include_dirs: [
-        // For android_mallopt definitions.
-        "bionic/libc/private"
+    header_libs: [
+        "bionic_libc_platform_headers",
     ],
+
     local_include_dirs: ["include"],
     export_include_dirs: ["include"],
 }

media/utils/MemoryLeakTrackUtil.cpp

@@ -22,7 +22,7 @@
 #include "media/MemoryLeakTrackUtil.h"
 #include <sstream>
 
-#include <bionic_malloc.h>
+#include <bionic/malloc.h>
 
 /*
  * The code here originally resided in MediaPlayerService.cpp