Backing this one out since the counterpart needs to be sent upstream.

This reverts commit 5ee320dd35.

Change-Id: I1a9c6b06c3aca595f01c629f7649be743dc48e77

tests/malloc_test.cpp

@@ -22,10 +22,6 @@
 #include <malloc.h>
 #include <unistd.h>
 
-#if defined(__BIONIC__)
-#include <libc/bionic/malloc_debug_common.h>
-#endif
-
 TEST(malloc, malloc_std) {
   // Simple malloc test.
   void *ptr = malloc(100);
@@ -295,10 +291,6 @@ TEST(malloc, realloc_overflow) {
   free(ptr);
 }
 
-#if defined(HAVE_DEPRECATED_MALLOC_FUNCS)
-extern "C" void* pvalloc(size_t);
-extern "C" void* valloc(size_t);
-
 TEST(malloc, pvalloc_std) {
   size_t pagesize = sysconf(_SC_PAGESIZE);
   void* ptr = pvalloc(100);
@@ -323,4 +315,3 @@ TEST(malloc, valloc_std) {
 TEST(malloc, valloc_overflow) {
   ASSERT_EQ(NULL, valloc(SIZE_MAX));
 }
-#endif