Revert of Use DiscardableMemoryManager on Android.

base/base.gypi

Index: base/base.gypi
diff --git a/base/base.gypi b/base/base.gypi
index 1767014bd870dd2c49daafafc963e29c99f283aa..09a3afaad6f91df6f178cd259e202c14a72f10c8 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -304,6 +304,8 @@
           'memory/aligned_memory.h',
           'memory/discardable_memory.cc',
           'memory/discardable_memory.h',
+          'memory/discardable_memory_allocator_android.cc',
+          'memory/discardable_memory_allocator_android.h',
           'memory/discardable_memory_android.cc',
           'memory/discardable_memory_emulated.cc',
           'memory/discardable_memory_emulated.h',
@@ -768,14 +770,6 @@
               ['include', '^threading/platform_thread_linux\\.cc$'],
             ],
           }],
-          ['OS == "android" and _toolset == "target"', {
-           'sources': [
-             'memory/discardable_memory_ashmem_allocator.cc',
-             'memory/discardable_memory_ashmem_allocator.h',
-             'memory/discardable_memory_ashmem.cc',
-             'memory/discardable_memory_ashmem.h',
-           ],
-          }],
           ['OS == "android" and >(nacl_untrusted_build)==0', {
             'sources!': [
               'base_paths_posix.cc',