Revert 267170 "Use DiscardableMemoryManager on Android."

trunk/src/base/base.gyp

Index: trunk/src/base/base.gyp
===================================================================
--- trunk/src/base/base.gyp	(revision 267174)
+++ trunk/src/base/base.gyp	(working copy)
@@ -474,6 +474,7 @@
         'mac/scoped_sending_event_unittest.mm',
         'md5_unittest.cc',
         'memory/aligned_memory_unittest.cc',
+        'memory/discardable_memory_allocator_android_unittest.cc',
         'memory/discardable_memory_manager_unittest.cc',
         'memory/discardable_memory_unittest.cc',
         'memory/linked_ptr_unittest.cc',
@@ -755,11 +756,6 @@
             ['include', '^sys_string_conversions_mac_unittest\\.mm$'],
           ],
         }],
-        ['OS == "android" and _toolset == "target"', {
-          'sources': [
-            'memory/discardable_memory_ashmem_allocator_unittest.cc',
-          ],
-        }],
         ['OS == "android"', {
           'sources/': [
             ['include', '^debug/proc_maps_linux_unittest\\.cc$'],