Revert "Enable DMP for system Chromium WebView on Android"

third_party/tcmalloc/chromium/src/libc_override_gcc_and_weak.h

 // Copyright (c) 2011, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 76 matching lines @@
   void* valloc(size_t size) __THROW               ALIAS(tc_valloc);
   void* pvalloc(size_t size) __THROW              ALIAS(tc_pvalloc);
   int posix_memalign(void** r, size_t a, size_t s) __THROW
       ALIAS(tc_posix_memalign);
   void malloc_stats(void) __THROW                 ALIAS(tc_malloc_stats);
   int mallopt(int cmd, int value) __THROW         ALIAS(tc_mallopt);
 #ifdef HAVE_STRUCT_MALLINFO
   struct mallinfo mallinfo(void) __THROW          ALIAS(tc_mallinfo);
 #endif
   size_t malloc_size(void* p) __THROW             ALIAS(tc_malloc_size);
-#if defined(__ANDROID__) && defined(ANDROID_NON_SDK_BUILD)
-  // In Android tree this function is defined differently than in the NDK.
-  size_t malloc_usable_size(const void* p) __THROW      ALIAS(tc_malloc_size);
-#else
   size_t malloc_usable_size(void* p) __THROW      ALIAS(tc_malloc_size);
-#endif
 }   // extern "C"
 
 #undef ALIAS
 
 // No need to do anything at tcmalloc-registration time: we do it all
 // via overriding weak symbols (at link time).
 static void ReplaceSystemAlloc() { }
 
 #endif  // TCMALLOC_LIBC_OVERRIDE_GCC_AND_WEAK_INL_H_