diff --git a/obj/chrome/test/_unit_tests__library.ninja b/obj/chrome/test/_unit_tests__library.ninja
index bb69139..0d74e10 100644
--- a/obj/chrome/test/_unit_tests__library.ninja
+++ b/obj/chrome/test/_unit_tests__library.ninja
@@ -15,5 +15,4 @@ build ./lib_unit_tests__library.so ./lib_unit_tests__library.so.TOC ./lib.unstri
   ../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-androideabi/4.9/libgcc.a
   obj/apps/libapps.a
-  obj/base/allocator/allocator.stamp
   obj/base/base_i18n.stamp
   obj/base/i18n/base_i18n_switches.o
diff --git a/obj/chrome/test/unit_tests_apk__build_config.ninja b/obj/chrome/test/unit_tests_apk__build_config.ninja
index c04d4e1..6949330 100644
--- a/obj/chrome/test/unit_tests_apk__build_config.ninja
+++ b/obj/chrome/test/unit_tests_apk__build_config.ninja
@@ -1,4 +1,4 @@
 rule __chrome_test_unit_tests_apk__build_config___build_toolchain_android_arm__rule
   command = python ../../build/android/gyp/write_build_config.py --type android_apk --depfile gen/chrome/test/unit_tests_apk__build_config.d --possible-deps-configs=\[\"gen/chrome/browser_dependencies.build_config\",\$ \"gen/chrome/child_dependencies.build_config\",\$ \"gen/chrome/test/test_support_unit.build_config\",\$ \"gen/base/test/test_support.build_config\",\$ \"gen/chrome/test/test_support.build_config\",\$ \"gen/components/content_settings/core/test/test_support.build_config\",\$ \"gen/components/resources/resources.build_config\",\$ \"gen/content/public/app/both.build_config\",\$ \"gen/content/test/test_support.build_config\",\$ \"gen/crypto/platform.build_config\",\$ \"gen/crypto/test_support.build_config\",\$ \"gen/net/net.build_config\",\$ \"gen/net/test_support.build_config\",\$ \"gen/sync/test_support_sync_api.build_config\",\$ \"gen/sync/test_support_sync_core.build_config\",\$ \"gen/sync/test_support_sync_internal_api.build_config\",\$ \"gen/testing/gmock/gmock.build_config\",\$ \"gen/testing/gtest/gtest.build_config\",\$
-\"gen/base/allocator/allocator.build_config\",\$
  \"gen/chrome/resources.build_config\",\$ \"gen/chrome/strings.build_config\",\$ \"gen/components/safe_browsing_db/test_database_manager.build_config\",\$ \"gen/components/version_info/generate_version_info.build_config\",\$ \"gen/courgette/courgette_lib.build_config\",\$ \"gen/google_apis/google_apis.build_config\",\$ \"gen/skia/skia.build_config\",\$ \"gen/third_party/cacheinvalidation/cacheinvalidation.build_config\",\$ \"gen/third_party/icu/icu.build_config\",\$ \"gen/third_party/libxml/libxml.build_config\",\$ \"gen/ui/base/test_support.build_config\",\$ \"gen/ui/gfx/test_support.build_config\",\$ \"gen/ui/resources/resources.build_config\",\$ \"gen/components/autofill/content/browser/wallet/test_support.build_config\",\$ \"gen/components/autofill/content/renderer/test_support.build_config\",\$ \"gen/components/data_reduction_proxy/core/browser/test_support.build_config\",\$ \"gen/components/data_use_measurement/core/core.build_config\",\$ \"gen/components/metrics/proto/proto.build_config\",\$ \"gen/components/safe_browsing_db/safe_browsing_db.build_config\",\$ \"gen/components/safe_json/test_support.build_config\",\$ \"gen/components/strings/strings.build_config\",\$ \"gen/components/webdata_services/test_support.build_config\",\$ \"gen/content/app/resources/resources.build_config\",\$ \"gen/device/bluetooth/mocks.build_config\",\$ \"gen/device/core/mocks.build_config\",\$ \"gen/device/usb/mocks.build_config\",\$ \"gen/gpu/test_support.build_config\",\$ \"gen/media/test_support.build_config\",\$ \"gen/third_party/leveldatabase/leveldatabase.build_config\",\$ \"gen/third_party/libjingle/libjingle.build_config\",\$ \"gen/third_party/libphonenumber/libphonenumber.build_config\",\$ \"gen/third_party/webrtc/modules/desktop_capture/desktop_capture.build_config\",\$ \"gen/tools/json_schema_compiler/test/test.build_config\",\$ \"gen/ui/gl/gl.build_config\",\$ \"gen/v8/v8.build_config\",\$ \"gen/chrome/test/unit_tests_java.build_config\",\$ \"gen/components/offline_pages/test_support.build_config\",\$ \"gen/v8/v8_external_startup_data_assets.build_config\",\$ \"gen/third_party/android_tools/google_play_services_default_resources.build_config\",\$ \"gen/chrome/browser/media/router/test_support.build_config\",\$ \"gen/third_party/cld_2/cld2_static.build_config\",\$ \"gen/chrome/packed_extra_resources.build_config\",\$ \"gen/chrome/packed_resources.build_config\",\$ \"gen/chrome/tools/convert_dict/lib.build_config\",\$ \"gen/third_party/hunspell/hunspell.build_config\",\$ \"gen/chrome/test/_unit_tests__library.build_config\",\$ \"gen/base/base_java.build_config\",\$ \"gen/testing/android/appurify_support/appurify_support_java.build_config\",\$ \"gen/testing/android/reporter/reporter_java.build_config\"\] --build-config gen/chrome/test/unit_tests_apk.build_config --jar-path gen/chrome/test/unit_tests_apk/unit_tests_apk.jar --dex-path gen/chrome/test/unit_tests_apk/classes.dex.zip --supports-android --requires-android --resources-zip gen/chrome/test/unit_tests_apk/unit_tests_apk.resources.zip --android-manifest ../../chrome/test/android/unit_tests_apk/AndroidManifest.xml --native-libs=\[\"lib_unit_tests__library.so\"\] --readelf-path=../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-readelf --apk-path=unit_tests_apk/unit_tests-debug.apk
   description = ACTION //chrome/test:unit_tests_apk__build_config(//build/toolchain/android:arm)
   restat = 1
@@ -21,5 +21,4 @@ build obj/chrome/test/unit_tests_apk__build_config.inputdeps.stamp:
   clang_x86/obj/v8/js2c_extras.stamp
   lib_unit_tests__library.so
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/chrome/test/unit_tests_apk__create__package.ninja b/obj/chrome/test/unit_tests_apk__create__package.ninja
index cbe3631..73641cb 100644
--- a/obj/chrome/test/unit_tests_apk__create__package.ninja
+++ b/obj/chrome/test/unit_tests_apk__create__package.ninja
@@ -23,5 +23,4 @@ build obj/chrome/test/unit_tests_apk__create__package.inputdeps.stamp:
   gen/chrome/test/unit_tests_apk/classes.dex.zip
   gen/chrome/test/unit_tests_apk/unit_tests_apk.apk_intermediates.ap_
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/chrome/test/unit_tests_apk__create__package_resources.ninja b/obj/chrome/test/unit_tests_apk__create__package_resources.ninja
index 2c9f2bc..23c3862 100644
--- a/obj/chrome/test/unit_tests_apk__create__package_resources.ninja
+++ b/obj/chrome/test/unit_tests_apk__create__package_resources.ninja
@@ -21,5 +21,4 @@ build obj/chrome/test/unit_tests_apk__create__package_resources.inputdeps.stamp:
   clang_x86/obj/v8/js2c_extras.stamp
   gen/chrome/test/unit_tests_apk/unit_tests_apk.resources.all.zip
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/chrome/test/unit_tests_apk__create_incremental__package.ninja b/obj/chrome/test/unit_tests_apk__create_incremental__package.ninja
index 7bbf073..5751d0c 100644
--- a/obj/chrome/test/unit_tests_apk__create_incremental__package.ninja
+++ b/obj/chrome/test/unit_tests_apk__create_incremental__package.ninja
@@ -23,5 +23,4 @@ build obj/chrome/test/unit_tests_apk__create_incremental__package.inputdeps.stam
   gen/chrome/test/unit_tests_apk.build_config
   gen/chrome/test/unit_tests_apk/unit_tests_apk.apk_intermediates_incremental.ap_
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/chrome/test/unit_tests_apk__create_incremental__package_resources.ninja b/obj/chrome/test/unit_tests_apk__create_incremental__package_resources.ninja
index 4c2ee93..e96b74d 100644
--- a/obj/chrome/test/unit_tests_apk__create_incremental__package_resources.ninja
+++ b/obj/chrome/test/unit_tests_apk__create_incremental__package_resources.ninja
@@ -21,5 +21,4 @@ build obj/chrome/test/unit_tests_apk__create_incremental__package_resources.inpu
   gen/chrome/test/unit_tests_apk/unit_tests_apk.resources.all.zip
   gen/chrome/test/unit_tests_apk__create_incremental_generate_manifest/AndroidManifest.xml
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/chrome/test/unit_tests_apk__create_incremental_generate_manifest.ninja b/obj/chrome/test/unit_tests_apk__create_incremental_generate_manifest.ninja
index 4718aac..2a6b544 100644
--- a/obj/chrome/test/unit_tests_apk__create_incremental_generate_manifest.ninja
+++ b/obj/chrome/test/unit_tests_apk__create_incremental_generate_manifest.ninja
@@ -20,5 +20,4 @@ build obj/chrome/test/unit_tests_apk__create_incremental_generate_manifest.input
   clang_x86/obj/v8/js2c_experimental_extras.stamp
   clang_x86/obj/v8/js2c_extras.stamp
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/chrome/test/unit_tests_apk__java__compile_java__javac.ninja b/obj/chrome/test/unit_tests_apk__java__compile_java__javac.ninja
index 45cdc57..76289b0 100644
--- a/obj/chrome/test/unit_tests_apk__java__compile_java__javac.ninja
+++ b/obj/chrome/test/unit_tests_apk__java__compile_java__javac.ninja
@@ -28,5 +28,4 @@ build obj/chrome/test/unit_tests_apk__java__compile_java__javac.inputdeps.stamp:
   gen/chrome/test/unit_tests_apk__process_resources.srcjar
   lib.java/android.interface.jar
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/chrome/test/unit_tests_apk__java__lint.ninja b/obj/chrome/test/unit_tests_apk__java__lint.ninja
index 304d9e4..be24c56 100644
--- a/obj/chrome/test/unit_tests_apk__java__lint.ninja
+++ b/obj/chrome/test/unit_tests_apk__java__lint.ninja
@@ -25,5 +25,4 @@ build obj/chrome/test/unit_tests_apk__java__lint.inputdeps.stamp:
   clang_x86/obj/v8/js2c_extras.stamp
   gen/chrome/test/unit_tests_apk/unit_tests_apk.jar
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/chrome/test/unit_tests_apk__process_resources.ninja b/obj/chrome/test/unit_tests_apk__process_resources.ninja
index eac5770..936e008 100644
--- a/obj/chrome/test/unit_tests_apk__process_resources.ninja
+++ b/obj/chrome/test/unit_tests_apk__process_resources.ninja
@@ -22,5 +22,4 @@ build obj/chrome/test/unit_tests_apk__process_resources.inputdeps.stamp:
   clang_x86/obj/v8/js2c_extras.stamp
   gen/chrome/test/unit_tests_apk.build_config
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/content/app/both.ninja b/obj/content/app/both.ninja
index 1679a6e..f6468da 100644
--- a/obj/content/app/both.ninja
+++ b/obj/content/app/both.ninja
@@ -197,5 +197,4 @@ build obj/content/app/both.inputdeps.stamp:
 
 build obj/content/app/both.stamp:
-  obj/base/allocator/allocator.stamp
   obj/base/base_i18n.stamp
   obj/base/libbase.a
diff --git a/obj/content/renderer/renderer.ninja b/obj/content/renderer/renderer.ninja
index aed4a15..18572c8 100644
--- a/obj/content/renderer/renderer.ninja
+++ b/obj/content/renderer/renderer.ninja
@@ -209,5 +209,4 @@ build obj/content/renderer/renderer.inputdeps.stamp:
 
 build obj/content/renderer/renderer.stamp:
-  obj/base/allocator/allocator.stamp
   obj/base/base_i18n.stamp
   obj/base/libbase.a
diff --git a/obj/content/shell/content_shell_lib.ninja b/obj/content/shell/content_shell_lib.ninja
index 65706a9..652ea89 100644
--- a/obj/content/shell/content_shell_lib.ninja
+++ b/obj/content/shell/content_shell_lib.ninja
@@ -608,5 +608,4 @@ build obj/content/shell/libcontent_shell_lib.a:
   ../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-androideabi/4.9/libgcc.a
   alink
-  obj/base/allocator/allocator.stamp
   obj/base/base_i18n.stamp
   obj/base/libbase.a
diff --git a/obj/content/test/_content_browsertests__library.ninja b/obj/content/test/_content_browsertests__library.ninja
index 07b7e36..f10406b 100644
--- a/obj/content/test/_content_browsertests__library.ninja
+++ b/obj/content/test/_content_browsertests__library.ninja
@@ -15,5 +15,4 @@ build ./lib_content_browsertests__library.so ./lib_content_browsertests__library
   ../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-androideabi/4.9/libgcc.a
   ./libosmesa.so
-  obj/base/allocator/allocator.stamp
   obj/base/base_i18n.stamp
   obj/base/i18n/base_i18n_switches.o
diff --git a/obj/content/test/_content_gl_benchmark__library.ninja b/obj/content/test/_content_gl_benchmark__library.ninja
index d2af686..3a79b3c 100644
--- a/obj/content/test/_content_gl_benchmark__library.ninja
+++ b/obj/content/test/_content_gl_benchmark__library.ninja
@@ -14,5 +14,4 @@ target_output_name = lib_content_gl_benchmark__library
 build ./lib_content_gl_benchmark__library.so ./lib_content_gl_benchmark__library.so.TOC ./lib.unstripped/lib_content_gl_benchmark__library.so:
   ../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-androideabi/4.9/libgcc.a
-  obj/base/allocator/allocator.stamp
   obj/base/base_i18n.stamp
   obj/base/i18n/base_i18n_switches.o
diff --git a/obj/content/test/_content_gl_tests__library.ninja b/obj/content/test/_content_gl_tests__library.ninja
index 5213063..23737c2 100644
--- a/obj/content/test/_content_gl_tests__library.ninja
+++ b/obj/content/test/_content_gl_tests__library.ninja
@@ -14,5 +14,4 @@ target_output_name = lib_content_gl_tests__library
 build ./lib_content_gl_tests__library.so ./lib_content_gl_tests__library.so.TOC ./lib.unstripped/lib_content_gl_tests__library.so:
   ../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-androideabi/4.9/libgcc.a
-  obj/base/allocator/allocator.stamp
   obj/base/base_i18n.stamp
   obj/base/i18n/base_i18n_switches.o
diff --git a/obj/content/test/_content_perftests__library.ninja b/obj/content/test/_content_perftests__library.ninja
index d60cf8b..dc834ef 100644
--- a/obj/content/test/_content_perftests__library.ninja
+++ b/obj/content/test/_content_perftests__library.ninja
@@ -14,5 +14,4 @@ target_output_name = lib_content_perftests__library
 build ./lib_content_perftests__library.so ./lib_content_perftests__library.so.TOC ./lib.unstripped/lib_content_perftests__library.so:
   ../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-androideabi/4.9/libgcc.a
-  obj/base/allocator/allocator.stamp
   obj/base/base_i18n.stamp
   obj/base/i18n/base_i18n_switches.o
diff --git a/obj/content/test/_content_unittests__library.ninja b/obj/content/test/_content_unittests__library.ninja
index 32d0cbe..fed7a66 100644
--- a/obj/content/test/_content_unittests__library.ninja
+++ b/obj/content/test/_content_unittests__library.ninja
@@ -15,5 +15,4 @@ build ./lib_content_unittests__library.so ./lib_content_unittests__library.so.TO
   ../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-androideabi/4.9/libgcc.a
   ./libosmesa.so
-  obj/base/allocator/allocator.stamp
   obj/base/base_i18n.stamp
   obj/base/base_java_unittest_support.stamp
diff --git a/obj/content/test/content_browsertests_apk__build_config.ninja b/obj/content/test/content_browsertests_apk__build_config.ninja
index 87d4abe..991e800 100644
--- a/obj/content/test/content_browsertests_apk__build_config.ninja
+++ b/obj/content/test/content_browsertests_apk__build_config.ninja
@@ -1,4 +1,4 @@
 rule __content_test_content_browsertests_apk__build_config___build_toolchain_android_arm__rule
   command = python ../../build/android/gyp/write_build_config.py --type android_apk --depfile gen/content/test/content_browsertests_apk__build_config.d --possible-deps-configs=\[\"gen/content/test/browsertest_support.build_config\",\$ \"gen/content/test/web_ui_test_mojo_bindings.build_config\",\$
-\"gen/base/allocator/allocator.build_config\",\$
  \"gen/base/test/test_support.build_config\",\$ \"gen/content/resources.build_config\",\$ \"gen/content/browser/background_sync/background_sync_proto.build_config\",\$ \"gen/content/common/mojo_bindings.build_config\",\$ \"gen/content/gpu/gpu.build_config\",\$ \"gen/content/public/common/common.build_config\",\$ \"gen/content/public/plugin/plugin.build_config\",\$ \"gen/content/public/renderer/renderer.build_config\",\$ \"gen/content/shell/content_shell_lib.build_config\",\$ \"gen/content/shell/pak.build_config\",\$ \"gen/content/test/test_support.build_config\",\$ \"gen/device/battery/mojo_bindings.build_config\",\$ \"gen/device/vibration/mojo_bindings.build_config\",\$ \"gen/gin/gin.build_config\",\$ \"gen/gpu/gpu.build_config\",\$ \"gen/ipc/test_support.build_config\",\$ \"gen/media/media_features.build_config\",\$ \"gen/media/shared_memory_support.build_config\",\$ \"gen/media/test_support.build_config\",\$ \"gen/media/audio/test_support.build_config\",\$ \"gen/media/base/test_support.build_config\",\$ \"gen/mojo/environment/chromium.build_config\",\$ \"gen/mojo/public/cpp/bindings/bindings.build_config\",\$ \"gen/mojo/public/js/js.build_config\",\$ \"gen/mojo/shell/public/cpp/cpp_for_chromium.build_config\",\$ \"gen/mojo/test/test_support.build_config\",\$ \"gen/net/test_support.build_config\",\$ \"gen/testing/gmock/gmock.build_config\",\$ \"gen/testing/gtest/gtest.build_config\",\$ \"gen/third_party/WebKit/public/blink.build_config\",\$ \"gen/third_party/leveldatabase/leveldatabase.build_config\",\$ \"gen/third_party/mesa/osmesa.build_config\",\$ \"gen/third_party/mojo/src/mojo/edk/system/system.build_config\",\$ \"gen/third_party/mojo/src/mojo/edk/test/test_support.build_config\",\$ \"gen/third_party/zlib/zlib.build_config\",\$ \"gen/ui/accessibility/accessibility.build_config\",\$ \"gen/ui/accessibility/ax_gen.build_config\",\$ \"gen/ui/base/base.build_config\",\$ \"gen/ui/base/ime/ime.build_config\",\$ \"gen/ui/gfx/gfx.build_config\",\$ \"gen/ui/gfx/geometry/geometry.build_config\",\$ \"gen/ui/gl/gl.build_config\",\$ \"gen/ui/gl/test_support.build_config\",\$ \"gen/ui/resources/resources.build_config\",\$ \"gen/ui/shell_dialogs/shell_dialogs.build_config\",\$ \"gen/ui/snapshot/snapshot.build_config\",\$ \"gen/content/test/content_browsertests_java.build_config\",\$ \"gen/content/test/content_browsertests_manifest.build_config\",\$ \"gen/content/shell/content_shell_lib.build_config\",\$ \"gen/content/shell/android/content_shell_assets.build_config\",\$ \"gen/content/shell/android/content_shell_jni_headers.build_config\",\$ \"gen/testing/android/native_test/native_test_support.build_config\",\$ \"gen/testing/perf/perf.build_config\",\$ \"gen/content/test/_content_browsertests__library.build_config\",\$ \"gen/base/base_java.build_config\",\$ \"gen/testing/android/appurify_support/appurify_support_java.build_config\",\$ \"gen/testing/android/reporter/reporter_java.build_config\"\] --build-config gen/content/test/content_browsertests_apk.build_config --jar-path gen/content/test/content_browsertests_apk/content_browsertests_apk.jar --dex-path gen/content/test/content_browsertests_apk/classes.dex --supports-android --requires-android --resources-zip gen/content/test/content_browsertests_apk/content_browsertests_apk.resources.zip --android-manifest gen/content/test/content_browsertests_manifest/AndroidManifest.xml --native-libs=\[\"lib_content_browsertests__library.so\"\] --readelf-path=../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-readelf --apk-path=content_browsertests_apk/content_browsertests-debug.apk
   description = ACTION //content/test:content_browsertests_apk__build_config(//build/toolchain/android:arm)
   restat = 1
@@ -22,5 +22,4 @@ build obj/content/test/content_browsertests_apk__build_config.inputdeps.stamp:
   gen/content/test/content_browsertests_manifest/AndroidManifest.xml
   lib_content_browsertests__library.so
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/content/test/content_browsertests_apk__create__package.ninja b/obj/content/test/content_browsertests_apk__create__package.ninja
index 578b52e..7e02682 100644
--- a/obj/content/test/content_browsertests_apk__create__package.ninja
+++ b/obj/content/test/content_browsertests_apk__create__package.ninja
@@ -24,5 +24,4 @@ build obj/content/test/content_browsertests_apk__create__package.inputdeps.stamp
   gen/content/test/content_browsertests_apk/classes.dex
   gen/content/test/content_browsertests_apk/content_browsertests_apk.apk_intermediates.ap_
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/content/test/content_browsertests_apk__create__package_resources.ninja b/obj/content/test/content_browsertests_apk__create__package_resources.ninja
index 7877920..0c4e3c2 100644
--- a/obj/content/test/content_browsertests_apk__create__package_resources.ninja
+++ b/obj/content/test/content_browsertests_apk__create__package_resources.ninja
@@ -22,5 +22,4 @@ build obj/content/test/content_browsertests_apk__create__package_resources.input
   gen/content/test/content_browsertests_apk/content_browsertests_apk.resources.all.zip
   gen/content/test/content_browsertests_manifest/AndroidManifest.xml
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/content/test/content_browsertests_apk__create_incremental__package.ninja b/obj/content/test/content_browsertests_apk__create_incremental__package.ninja
index 9365202..961c72a 100644
--- a/obj/content/test/content_browsertests_apk__create_incremental__package.ninja
+++ b/obj/content/test/content_browsertests_apk__create_incremental__package.ninja
@@ -24,5 +24,4 @@ build obj/content/test/content_browsertests_apk__create_incremental__package.inp
   gen/content/test/content_browsertests_apk.build_config
   gen/content/test/content_browsertests_apk/content_browsertests_apk.apk_intermediates_incremental.ap_
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/content/test/content_browsertests_apk__create_incremental__package_resources.ninja b/obj/content/test/content_browsertests_apk__create_incremental__package_resources.ninja
index 129d12a..16b6fa4 100644
--- a/obj/content/test/content_browsertests_apk__create_incremental__package_resources.ninja
+++ b/obj/content/test/content_browsertests_apk__create_incremental__package_resources.ninja
@@ -22,5 +22,4 @@ build obj/content/test/content_browsertests_apk__create_incremental__package_res
   gen/content/test/content_browsertests_apk/content_browsertests_apk.resources.all.zip
   gen/content/test/content_browsertests_apk__create_incremental_generate_manifest/AndroidManifest.xml
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/content/test/content_browsertests_apk__create_incremental_generate_manifest.ninja b/obj/content/test/content_browsertests_apk__create_incremental_generate_manifest.ninja
index 56d76ec..05bd552 100644
--- a/obj/content/test/content_browsertests_apk__create_incremental_generate_manifest.ninja
+++ b/obj/content/test/content_browsertests_apk__create_incremental_generate_manifest.ninja
@@ -21,5 +21,4 @@ build obj/content/test/content_browsertests_apk__create_incremental_generate_man
   clang_x86/obj/v8/js2c_extras.stamp
   gen/content/test/content_browsertests_manifest/AndroidManifest.xml
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/content/test/content_browsertests_apk__java__compile_java__javac.ninja b/obj/content/test/content_browsertests_apk__java__compile_java__javac.ninja
index fadc48d..5028d14 100644
--- a/obj/content/test/content_browsertests_apk__java__compile_java__javac.ninja
+++ b/obj/content/test/content_browsertests_apk__java__compile_java__javac.ninja
@@ -25,5 +25,4 @@ build obj/content/test/content_browsertests_apk__java__compile_java__javac.input
   gen/content/test/content_browsertests_apk__process_resources.srcjar
   lib.java/android.interface.jar
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/content/test/content_browsertests_apk__java__lint.ninja b/obj/content/test/content_browsertests_apk__java__lint.ninja
index 8398a18..9f34d96 100644
--- a/obj/content/test/content_browsertests_apk__java__lint.ninja
+++ b/obj/content/test/content_browsertests_apk__java__lint.ninja
@@ -22,5 +22,4 @@ build obj/content/test/content_browsertests_apk__java__lint.inputdeps.stamp:
   gen/content/test/content_browsertests_apk/content_browsertests_apk.jar
   gen/content/test/content_browsertests_manifest/AndroidManifest.xml
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/content/test/content_browsertests_apk__process_resources.ninja b/obj/content/test/content_browsertests_apk__process_resources.ninja
index df7ac73..7b3479f 100644
--- a/obj/content/test/content_browsertests_apk__process_resources.ninja
+++ b/obj/content/test/content_browsertests_apk__process_resources.ninja
@@ -23,5 +23,4 @@ build obj/content/test/content_browsertests_apk__process_resources.inputdeps.sta
   gen/content/test/content_browsertests_apk.build_config
   gen/content/test/content_browsertests_manifest/AndroidManifest.xml
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/content/test/content_gl_benchmark_apk__build_config.ninja b/obj/content/test/content_gl_benchmark_apk__build_config.ninja
index 258dc2a..cbea8ca 100644
--- a/obj/content/test/content_gl_benchmark_apk__build_config.ninja
+++ b/obj/content/test/content_gl_benchmark_apk__build_config.ninja
@@ -1,4 +1,4 @@
 rule __content_test_content_gl_benchmark_apk__build_config___build_toolchain_android_arm__rule
   command = python ../../build/android/gyp/write_build_config.py --type android_apk --depfile gen/content/test/content_gl_benchmark_apk__build_config.d --possible-deps-configs=\[\"gen/content/test/test_support.build_config\",\$
-\"gen/base/allocator/allocator.build_config\",\$
  \"gen/base/test/test_support.build_config\",\$ \"gen/content/public/common/common.build_config\",\$ \"gen/gpu/blink/blink.build_config\",\$ \"gen/testing/gtest/gtest.build_config\",\$ \"gen/third_party/WebKit/public/blink.build_config\",\$ \"gen/ui/base/base.build_config\",\$ \"gen/ui/gfx/gfx.build_config\",\$ \"gen/ui/gfx/geometry/geometry.build_config\",\$ \"gen/ui/gl/gl.build_config\",\$ \"gen/ui/gl/test_support.build_config\",\$ \"gen/content/test/_content_gl_benchmark__library.build_config\",\$ \"gen/base/base_java.build_config\",\$ \"gen/testing/android/appurify_support/appurify_support_java.build_config\",\$ \"gen/testing/android/reporter/reporter_java.build_config\"\] --build-config gen/content/test/content_gl_benchmark_apk.build_config --jar-path gen/content/test/content_gl_benchmark_apk/content_gl_benchmark_apk.jar --dex-path gen/content/test/content_gl_benchmark_apk/classes.dex --supports-android --requires-android --resources-zip gen/content/test/content_gl_benchmark_apk/content_gl_benchmark_apk.resources.zip --android-manifest ../../testing/android/native_test/java/AndroidManifest.xml --native-libs=\[\"lib_content_gl_benchmark__library.so\"\] --readelf-path=../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-readelf --apk-path=content_gl_benchmark_apk/content_gl_benchmark-debug.apk
   description = ACTION //content/test:content_gl_benchmark_apk__build_config(//build/toolchain/android:arm)
   restat = 1
@@ -21,5 +21,4 @@ build obj/content/test/content_gl_benchmark_apk__build_config.inputdeps.stamp:
   clang_x86/obj/v8/js2c_extras.stamp
   lib_content_gl_benchmark__library.so
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/content/test/content_gl_benchmark_apk__create__package.ninja b/obj/content/test/content_gl_benchmark_apk__create__package.ninja
index 8531ce0..81a1393 100644
--- a/obj/content/test/content_gl_benchmark_apk__create__package.ninja
+++ b/obj/content/test/content_gl_benchmark_apk__create__package.ninja
@@ -23,5 +23,4 @@ build obj/content/test/content_gl_benchmark_apk__create__package.inputdeps.stamp
   gen/content/test/content_gl_benchmark_apk/classes.dex
   gen/content/test/content_gl_benchmark_apk/content_gl_benchmark_apk.apk_intermediates.ap_
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/content/test/content_gl_benchmark_apk__create__package_resources.ninja b/obj/content/test/content_gl_benchmark_apk__create__package_resources.ninja
index 9317db4..b516574 100644
--- a/obj/content/test/content_gl_benchmark_apk__create__package_resources.ninja
+++ b/obj/content/test/content_gl_benchmark_apk__create__package_resources.ninja
@@ -21,5 +21,4 @@ build obj/content/test/content_gl_benchmark_apk__create__package_resources.input
   clang_x86/obj/v8/js2c_extras.stamp
   gen/content/test/content_gl_benchmark_apk/content_gl_benchmark_apk.resources.all.zip
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/content/test/content_gl_benchmark_apk__create_incremental__package.ninja b/obj/content/test/content_gl_benchmark_apk__create_incremental__package.ninja
index 8a8f1fd..0a6fdde 100644
--- a/obj/content/test/content_gl_benchmark_apk__create_incremental__package.ninja
+++ b/obj/content/test/content_gl_benchmark_apk__create_incremental__package.ninja
@@ -23,5 +23,4 @@ build obj/content/test/content_gl_benchmark_apk__create_incremental__package.inp
   gen/content/test/content_gl_benchmark_apk.build_config
   gen/content/test/content_gl_benchmark_apk/content_gl_benchmark_apk.apk_intermediates_incremental.ap_
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/content/test/content_gl_benchmark_apk__create_incremental__package_resources.ninja b/obj/content/test/content_gl_benchmark_apk__create_incremental__package_resources.ninja
index 695d85c..195d1d9 100644
--- a/obj/content/test/content_gl_benchmark_apk__create_incremental__package_resources.ninja
+++ b/obj/content/test/content_gl_benchmark_apk__create_incremental__package_resources.ninja
@@ -21,5 +21,4 @@ build obj/content/test/content_gl_benchmark_apk__create_incremental__package_res
   gen/content/test/content_gl_benchmark_apk/content_gl_benchmark_apk.resources.all.zip
   gen/content/test/content_gl_benchmark_apk__create_incremental_generate_manifest/AndroidManifest.xml
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/content/test/content_gl_benchmark_apk__create_incremental_generate_manifest.ninja b/obj/content/test/content_gl_benchmark_apk__create_incremental_generate_manifest.ninja
index 251a590..b231841 100644
--- a/obj/content/test/content_gl_benchmark_apk__create_incremental_generate_manifest.ninja
+++ b/obj/content/test/content_gl_benchmark_apk__create_incremental_generate_manifest.ninja
@@ -20,5 +20,4 @@ build obj/content/test/content_gl_benchmark_apk__create_incremental_generate_man
   clang_x86/obj/v8/js2c_experimental_extras.stamp
   clang_x86/obj/v8/js2c_extras.stamp
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/content/test/content_gl_benchmark_apk__java__compile_java__javac.ninja b/obj/content/test/content_gl_benchmark_apk__java__compile_java__javac.ninja
index 3675840..7da5434 100644
--- a/obj/content/test/content_gl_benchmark_apk__java__compile_java__javac.ninja
+++ b/obj/content/test/content_gl_benchmark_apk__java__compile_java__javac.ninja
@@ -28,5 +28,4 @@ build obj/content/test/content_gl_benchmark_apk__java__compile_java__javac.input
   gen/content/test/content_gl_benchmark_apk__process_resources.srcjar
   lib.java/android.interface.jar
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/content/test/content_gl_benchmark_apk__java__lint.ninja b/obj/content/test/content_gl_benchmark_apk__java__lint.ninja
index ccbbbdd..ab5f669 100644
--- a/obj/content/test/content_gl_benchmark_apk__java__lint.ninja
+++ b/obj/content/test/content_gl_benchmark_apk__java__lint.ninja
@@ -25,5 +25,4 @@ build obj/content/test/content_gl_benchmark_apk__java__lint.inputdeps.stamp:
   clang_x86/obj/v8/js2c_extras.stamp
   gen/content/test/content_gl_benchmark_apk/content_gl_benchmark_apk.jar
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/content/test/content_gl_benchmark_apk__process_resources.ninja b/obj/content/test/content_gl_benchmark_apk__process_resources.ninja
index 92faa5a..8f0071a 100644
--- a/obj/content/test/content_gl_benchmark_apk__process_resources.ninja
+++ b/obj/content/test/content_gl_benchmark_apk__process_resources.ninja
@@ -22,5 +22,4 @@ build obj/content/test/content_gl_benchmark_apk__process_resources.inputdeps.sta
   clang_x86/obj/v8/js2c_extras.stamp
   gen/content/test/content_gl_benchmark_apk.build_config
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/content/test/content_gl_tests_apk__build_config.ninja b/obj/content/test/content_gl_tests_apk__build_config.ninja
index ab91754..6f6dd1f 100644
--- a/obj/content/test/content_gl_tests_apk__build_config.ninja
+++ b/obj/content/test/content_gl_tests_apk__build_config.ninja
@@ -1,4 +1,4 @@
 rule __content_test_content_gl_tests_apk__build_config___build_toolchain_android_arm__rule
   command = python ../../build/android/gyp/write_build_config.py --type android_apk --depfile gen/content/test/content_gl_tests_apk__build_config.d --possible-deps-configs=\[\"gen/content/test/test_support.build_config\",\$
-\"gen/base/allocator/allocator.build_config\",\$
  \"gen/base/test/test_support.build_config\",\$ \"gen/content/public/common/common.build_config\",\$ \"gen/gpu/blink/blink.build_config\",\$ \"gen/gpu/command_buffer/common/common.build_config\",\$ \"gen/testing/gtest/gtest.build_config\",\$ \"gen/third_party/WebKit/public/blink.build_config\",\$ \"gen/ui/base/base.build_config\",\$ \"gen/ui/gfx/gfx.build_config\",\$ \"gen/ui/gfx/test_support.build_config\",\$ \"gen/ui/gfx/geometry/geometry.build_config\",\$ \"gen/ui/gl/gl.build_config\",\$ \"gen/ui/gl/test_support.build_config\",\$ \"gen/v8/v8.build_config\",\$ \"gen/content/public/test/android/content_java_test_support.build_config\",\$ \"gen/content/shell/android/content_shell_assets.build_config\",\$ \"gen/content/test/_content_gl_tests__library.build_config\",\$ \"gen/base/base_java.build_config\",\$ \"gen/testing/android/appurify_support/appurify_support_java.build_config\",\$ \"gen/testing/android/reporter/reporter_java.build_config\"\] --build-config gen/content/test/content_gl_tests_apk.build_config --jar-path gen/content/test/content_gl_tests_apk/content_gl_tests_apk.jar --dex-path gen/content/test/content_gl_tests_apk/classes.dex --supports-android --requires-android --resources-zip gen/content/test/content_gl_tests_apk/content_gl_tests_apk.resources.zip --android-manifest ../../testing/android/native_test/java/AndroidManifest.xml --native-libs=\[\"lib_content_gl_tests__library.so\"\] --readelf-path=../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-readelf --apk-path=content_gl_tests_apk/content_gl_tests-debug.apk
   description = ACTION //content/test:content_gl_tests_apk__build_config(//build/toolchain/android:arm)
   restat = 1
@@ -21,5 +21,4 @@ build obj/content/test/content_gl_tests_apk__build_config.inputdeps.stamp:
   clang_x86/obj/v8/js2c_extras.stamp
   lib_content_gl_tests__library.so
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/content/test/content_gl_tests_apk__create__package.ninja b/obj/content/test/content_gl_tests_apk__create__package.ninja
index 74582ed..bf3332f 100644
--- a/obj/content/test/content_gl_tests_apk__create__package.ninja
+++ b/obj/content/test/content_gl_tests_apk__create__package.ninja
@@ -23,5 +23,4 @@ build obj/content/test/content_gl_tests_apk__create__package.inputdeps.stamp:
   gen/content/test/content_gl_tests_apk/classes.dex
   gen/content/test/content_gl_tests_apk/content_gl_tests_apk.apk_intermediates.ap_
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/content/test/content_gl_tests_apk__create__package_resources.ninja b/obj/content/test/content_gl_tests_apk__create__package_resources.ninja
index 36e7e8a..ca4909b 100644
--- a/obj/content/test/content_gl_tests_apk__create__package_resources.ninja
+++ b/obj/content/test/content_gl_tests_apk__create__package_resources.ninja
@@ -21,5 +21,4 @@ build obj/content/test/content_gl_tests_apk__create__package_resources.inputdeps
   clang_x86/obj/v8/js2c_extras.stamp
   gen/content/test/content_gl_tests_apk/content_gl_tests_apk.resources.all.zip
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/content/test/content_gl_tests_apk__create_incremental__package.ninja b/obj/content/test/content_gl_tests_apk__create_incremental__package.ninja
index b6cb21e..aaa9863 100644
--- a/obj/content/test/content_gl_tests_apk__create_incremental__package.ninja
+++ b/obj/content/test/content_gl_tests_apk__create_incremental__package.ninja
@@ -23,5 +23,4 @@ build obj/content/test/content_gl_tests_apk__create_incremental__package.inputde
   gen/content/test/content_gl_tests_apk.build_config
   gen/content/test/content_gl_tests_apk/content_gl_tests_apk.apk_intermediates_incremental.ap_
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/content/test/content_gl_tests_apk__create_incremental__package_resources.ninja b/obj/content/test/content_gl_tests_apk__create_incremental__package_resources.ninja
index ccd2b1b..aec4cb7 100644
--- a/obj/content/test/content_gl_tests_apk__create_incremental__package_resources.ninja
+++ b/obj/content/test/content_gl_tests_apk__create_incremental__package_resources.ninja
@@ -21,5 +21,4 @@ build obj/content/test/content_gl_tests_apk__create_incremental__package_resourc
   gen/content/test/content_gl_tests_apk/content_gl_tests_apk.resources.all.zip
   gen/content/test/content_gl_tests_apk__create_incremental_generate_manifest/AndroidManifest.xml
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/content/test/content_gl_tests_apk__create_incremental_generate_manifest.ninja b/obj/content/test/content_gl_tests_apk__create_incremental_generate_manifest.ninja
index 5bb0c14..3478092 100644
--- a/obj/content/test/content_gl_tests_apk__create_incremental_generate_manifest.ninja
+++ b/obj/content/test/content_gl_tests_apk__create_incremental_generate_manifest.ninja
@@ -20,5 +20,4 @@ build obj/content/test/content_gl_tests_apk__create_incremental_generate_manifes
   clang_x86/obj/v8/js2c_experimental_extras.stamp
   clang_x86/obj/v8/js2c_extras.stamp
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/content/test/content_gl_tests_apk__java__compile_java__javac.ninja b/obj/content/test/content_gl_tests_apk__java__compile_java__javac.ninja
index 74f6905..963ffc8 100644
--- a/obj/content/test/content_gl_tests_apk__java__compile_java__javac.ninja
+++ b/obj/content/test/content_gl_tests_apk__java__compile_java__javac.ninja
@@ -28,5 +28,4 @@ build obj/content/test/content_gl_tests_apk__java__compile_java__javac.inputdeps
   gen/content/test/content_gl_tests_apk__process_resources.srcjar
   lib.java/android.interface.jar
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/content/test/content_gl_tests_apk__java__lint.ninja b/obj/content/test/content_gl_tests_apk__java__lint.ninja
index 2e4b624..a0d9d20 100644
--- a/obj/content/test/content_gl_tests_apk__java__lint.ninja
+++ b/obj/content/test/content_gl_tests_apk__java__lint.ninja
@@ -25,5 +25,4 @@ build obj/content/test/content_gl_tests_apk__java__lint.inputdeps.stamp:
   clang_x86/obj/v8/js2c_extras.stamp
   gen/content/test/content_gl_tests_apk/content_gl_tests_apk.jar
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/content/test/content_gl_tests_apk__process_resources.ninja b/obj/content/test/content_gl_tests_apk__process_resources.ninja
index 68f39af..f9eaef4 100644
--- a/obj/content/test/content_gl_tests_apk__process_resources.ninja
+++ b/obj/content/test/content_gl_tests_apk__process_resources.ninja
@@ -22,5 +22,4 @@ build obj/content/test/content_gl_tests_apk__process_resources.inputdeps.stamp:
   clang_x86/obj/v8/js2c_extras.stamp
   gen/content/test/content_gl_tests_apk.build_config
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/content/test/content_perftests_apk__build_config.ninja b/obj/content/test/content_perftests_apk__build_config.ninja
index 5c0baca..ee1d5c8 100644
--- a/obj/content/test/content_perftests_apk__build_config.ninja
+++ b/obj/content/test/content_perftests_apk__build_config.ninja
@@ -1,4 +1,4 @@
 rule __content_test_content_perftests_apk__build_config___build_toolchain_android_arm__rule
   command = python ../../build/android/gyp/write_build_config.py --type android_apk --depfile gen/content/test/content_perftests_apk__build_config.d 
---possible-deps-configs=\[\"gen/base/allocator/allocator.build_config\",\$ \"gen/base/test/test_support.build_config\",\$
+--possible-deps-configs=\[\"gen/base/test/test_support.build_config\",\$
  \"gen/cc/cc.build_config\",\$ \"gen/content/public/browser/browser.build_config\",\$ \"gen/content/public/common/common.build_config\",\$ \"gen/content/test/test_support.build_config\",\$ \"gen/skia/skia.build_config\",\$ \"gen/testing/gtest/gtest.build_config\",\$ \"gen/testing/perf/perf.build_config\",\$ \"gen/ui/gfx/gfx.build_config\",\$ \"gen/ui/gfx/geometry/geometry.build_config\",\$ \"gen/testing/android/native_test/native_test_native_code.build_config\",\$ \"gen/content/test/_content_perftests__library.build_config\",\$ \"gen/base/base_java.build_config\",\$ \"gen/testing/android/appurify_support/appurify_support_java.build_config\",\$ \"gen/testing/android/reporter/reporter_java.build_config\"\] --build-config gen/content/test/content_perftests_apk.build_config --jar-path gen/content/test/content_perftests_apk/content_perftests_apk.jar --dex-path gen/content/test/content_perftests_apk/classes.dex --supports-android --requires-android --resources-zip gen/content/test/content_perftests_apk/content_perftests_apk.resources.zip --android-manifest ../../testing/android/native_test/java/AndroidManifest.xml --native-libs=\[\"lib_content_perftests__library.so\"\] --readelf-path=../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-readelf --apk-path=content_perftests_apk/content_perftests-debug.apk
   description = ACTION //content/test:content_perftests_apk__build_config(//build/toolchain/android:arm)
   restat = 1
@@ -21,5 +21,4 @@ build obj/content/test/content_perftests_apk__build_config.inputdeps.stamp:
   clang_x86/obj/v8/js2c_extras.stamp
   lib_content_perftests__library.so
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/content/test/content_perftests_apk__create__package.ninja b/obj/content/test/content_perftests_apk__create__package.ninja
index 327918a..aa2f08b 100644
--- a/obj/content/test/content_perftests_apk__create__package.ninja
+++ b/obj/content/test/content_perftests_apk__create__package.ninja
@@ -23,5 +23,4 @@ build obj/content/test/content_perftests_apk__create__package.inputdeps.stamp:
   gen/content/test/content_perftests_apk/classes.dex
   gen/content/test/content_perftests_apk/content_perftests_apk.apk_intermediates.ap_
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/content/test/content_perftests_apk__create__package_resources.ninja b/obj/content/test/content_perftests_apk__create__package_resources.ninja
index 5b1cafa..22f2551 100644
--- a/obj/content/test/content_perftests_apk__create__package_resources.ninja
+++ b/obj/content/test/content_perftests_apk__create__package_resources.ninja
@@ -21,5 +21,4 @@ build obj/content/test/content_perftests_apk__create__package_resources.inputdep
   clang_x86/obj/v8/js2c_extras.stamp
   gen/content/test/content_perftests_apk/content_perftests_apk.resources.all.zip
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/content/test/content_perftests_apk__create_incremental__package.ninja b/obj/content/test/content_perftests_apk__create_incremental__package.ninja
index 71cbbb1..76cf92d 100644
--- a/obj/content/test/content_perftests_apk__create_incremental__package.ninja
+++ b/obj/content/test/content_perftests_apk__create_incremental__package.ninja
@@ -23,5 +23,4 @@ build obj/content/test/content_perftests_apk__create_incremental__package.inputd
   gen/content/test/content_perftests_apk.build_config
   gen/content/test/content_perftests_apk/content_perftests_apk.apk_intermediates_incremental.ap_
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/content/test/content_perftests_apk__create_incremental__package_resources.ninja b/obj/content/test/content_perftests_apk__create_incremental__package_resources.ninja
index 35cffa4..ffd7df6 100644
--- a/obj/content/test/content_perftests_apk__create_incremental__package_resources.ninja
+++ b/obj/content/test/content_perftests_apk__create_incremental__package_resources.ninja
@@ -21,5 +21,4 @@ build obj/content/test/content_perftests_apk__create_incremental__package_resour
   gen/content/test/content_perftests_apk/content_perftests_apk.resources.all.zip
   gen/content/test/content_perftests_apk__create_incremental_generate_manifest/AndroidManifest.xml
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/content/test/content_perftests_apk__create_incremental_generate_manifest.ninja b/obj/content/test/content_perftests_apk__create_incremental_generate_manifest.ninja
index 87a5af2..0a1dd2b 100644
--- a/obj/content/test/content_perftests_apk__create_incremental_generate_manifest.ninja
+++ b/obj/content/test/content_perftests_apk__create_incremental_generate_manifest.ninja
@@ -20,5 +20,4 @@ build obj/content/test/content_perftests_apk__create_incremental_generate_manife
   clang_x86/obj/v8/js2c_experimental_extras.stamp
   clang_x86/obj/v8/js2c_extras.stamp
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/content/test/content_perftests_apk__java__compile_java__javac.ninja b/obj/content/test/content_perftests_apk__java__compile_java__javac.ninja
index 8679ade..0d29b6c 100644
--- a/obj/content/test/content_perftests_apk__java__compile_java__javac.ninja
+++ b/obj/content/test/content_perftests_apk__java__compile_java__javac.ninja
@@ -28,5 +28,4 @@ build obj/content/test/content_perftests_apk__java__compile_java__javac.inputdep
   gen/content/test/content_perftests_apk__process_resources.srcjar
   lib.java/android.interface.jar
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/content/test/content_perftests_apk__java__lint.ninja b/obj/content/test/content_perftests_apk__java__lint.ninja
index b9ec7ad..03b1801 100644
--- a/obj/content/test/content_perftests_apk__java__lint.ninja
+++ b/obj/content/test/content_perftests_apk__java__lint.ninja
@@ -25,5 +25,4 @@ build obj/content/test/content_perftests_apk__java__lint.inputdeps.stamp:
   clang_x86/obj/v8/js2c_extras.stamp
   gen/content/test/content_perftests_apk/content_perftests_apk.jar
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/content/test/content_perftests_apk__process_resources.ninja b/obj/content/test/content_perftests_apk__process_resources.ninja
index 7838640..79f8e22 100644
--- a/obj/content/test/content_perftests_apk__process_resources.ninja
+++ b/obj/content/test/content_perftests_apk__process_resources.ninja
@@ -22,5 +22,4 @@ build obj/content/test/content_perftests_apk__process_resources.inputdeps.stamp:
   clang_x86/obj/v8/js2c_extras.stamp
   gen/content/test/content_perftests_apk.build_config
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/content/test/content_unittests_apk__build_config.ninja b/obj/content/test/content_unittests_apk__build_config.ninja
index c21484b..d8f7760 100644
--- a/obj/content/test/content_unittests_apk__build_config.ninja
+++ b/obj/content/test/content_unittests_apk__build_config.ninja
@@ -1,4 +1,4 @@
 rule __content_test_content_unittests_apk__build_config___build_toolchain_android_arm__rule
   command = python ../../build/android/gyp/write_build_config.py --type android_apk --depfile gen/content/test/content_unittests_apk__build_config.d --possible-deps-configs=\[\"gen/content/test/test_support.build_config\",\$
-\"gen/base/allocator/allocator.build_config\",\$
  \"gen/base/test/test_support.build_config\",\$ \"gen/content/browser/background_sync/background_sync_proto.build_config\",\$ \"gen/content/browser/cache_storage/cache_storage_proto.build_config\",\$ \"gen/content/browser/notifications/notification_proto.build_config\",\$ \"gen/content/browser/service_worker/service_worker_proto.build_config\",\$ \"gen/content/browser/speech/proto/proto.build_config\",\$ \"gen/content/common/mojo_bindings.build_config\",\$ \"gen/content/public/browser/browser.build_config\",\$ \"gen/content/public/common/common.build_config\",\$ \"gen/content/public/common/mojo_bindings.build_config\",\$ \"gen/crypto/crypto.build_config\",\$ \"gen/device/battery/mojo_bindings.build_config\",\$ \"gen/mojo/environment/chromium.build_config\",\$ \"gen/mojo/public/cpp/bindings/bindings.build_config\",\$ \"gen/net/extras.build_config\",\$ \"gen/net/test_support.build_config\",\$ \"gen/skia/skia.build_config\",\$ \"gen/sql/sql.build_config\",\$ \"gen/sql/test_support.build_config\",\$ \"gen/testing/gmock/gmock.build_config\",\$ \"gen/testing/gtest/gtest.build_config\",\$ \"gen/third_party/mojo/src/mojo/edk/test/test_support.build_config\",\$ \"gen/third_party/re2/re2.build_config\",\$ \"gen/ui/accessibility/accessibility.build_config\",\$ \"gen/ui/base/base.build_config\",\$ \"gen/ui/events/blink/blink.build_config\",\$ \"gen/ui/gfx/gfx.build_config\",\$ \"gen/ui/gfx/geometry/geometry.build_config\",\$ \"gen/ui/gfx/ipc/ipc.build_config\",\$ \"gen/base/third_party/dynamic_annotations/dynamic_annotations.build_config\",\$ \"gen/cc/cc.build_config\",\$ \"gen/cc/test_support.build_config\",\$ \"gen/cc/surfaces/surfaces.build_config\",\$ \"gen/content/resources.build_config\",\$ \"gen/content/gpu/gpu.build_config\",\$ \"gen/content/public/browser/browser.build_config\",\$ \"gen/content/public/child/child.build_config\",\$ \"gen/content/public/plugin/plugin.build_config\",\$ \"gen/content/public/renderer/renderer.build_config\",\$ \"gen/gin/gin.build_config\",\$ \"gen/gpu/gpu.build_config\",\$ \"gen/gpu/test_support.build_config\",\$ \"gen/ipc/test_support.build_config\",\$ \"gen/media/shared_memory_support.build_config\",\$ \"gen/media/test_support.build_config\",\$ \"gen/media/audio/test_support.build_config\",\$ \"gen/media/base/test_support.build_config\",\$ \"gen/media/midi/midi.build_config\",\$ \"gen/storage/browser/browser.build_config\",\$ \"gen/storage/common/common.build_config\",\$ \"gen/third_party/WebKit/public/blink.build_config\",\$ \"gen/third_party/icu/icu.build_config\",\$ \"gen/third_party/leveldatabase/leveldatabase.build_config\",\$ \"gen/third_party/libjingle/libjingle.build_config\",\$ \"gen/ui/compositor/test_support.build_config\",\$ \"gen/ui/gl/gl.build_config\",\$ \"gen/ui/gl/test_support.build_config\",\$ \"gen/third_party/libjingle/libjingle_webrtc.build_config\",\$ \"gen/third_party/libjingle/libpeerconnection.build_config\",\$ \"gen/third_party/webrtc/modules/video_capture/video_capture.build_config\",\$ \"gen/base/base_java_unittest_support.build_config\",\$ \"gen/content/public/android/content_java.build_config\",\$ \"gen/v8/v8_external_startup_data_assets.build_config\",\$ \"gen/content/test/_content_unittests__library.build_config\",\$ \"gen/base/base_java.build_config\",\$ \"gen/testing/android/appurify_support/appurify_support_java.build_config\",\$ \"gen/testing/android/reporter/reporter_java.build_config\"\] --build-config gen/content/test/content_unittests_apk.build_config --jar-path gen/content/test/content_unittests_apk/content_unittests_apk.jar --dex-path gen/content/test/content_unittests_apk/classes.dex --supports-android --requires-android --resources-zip gen/content/test/content_unittests_apk/content_unittests_apk.resources.zip --android-manifest ../../testing/android/native_test/java/AndroidManifest.xml --native-libs=\[\"lib_content_unittests__library.so\"\] --readelf-path=../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-readelf --apk-path=content_unittests_apk/content_unittests-debug.apk
   description = ACTION //content/test:content_unittests_apk__build_config(//build/toolchain/android:arm)
   restat = 1
@@ -21,5 +21,4 @@ build obj/content/test/content_unittests_apk__build_config.inputdeps.stamp:
   clang_x86/obj/v8/js2c_extras.stamp
   lib_content_unittests__library.so
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/content/test/content_unittests_apk__create__package.ninja b/obj/content/test/content_unittests_apk__create__package.ninja
index 1b58e65..f072c35 100644
--- a/obj/content/test/content_unittests_apk__create__package.ninja
+++ b/obj/content/test/content_unittests_apk__create__package.ninja
@@ -23,5 +23,4 @@ build obj/content/test/content_unittests_apk__create__package.inputdeps.stamp:
   gen/content/test/content_unittests_apk/classes.dex
   gen/content/test/content_unittests_apk/content_unittests_apk.apk_intermediates.ap_
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/content/test/content_unittests_apk__create__package_resources.ninja b/obj/content/test/content_unittests_apk__create__package_resources.ninja
index c8ec331..7776c45 100644
--- a/obj/content/test/content_unittests_apk__create__package_resources.ninja
+++ b/obj/content/test/content_unittests_apk__create__package_resources.ninja
@@ -21,5 +21,4 @@ build obj/content/test/content_unittests_apk__create__package_resources.inputdep
   clang_x86/obj/v8/js2c_extras.stamp
   gen/content/test/content_unittests_apk/content_unittests_apk.resources.all.zip
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/content/test/content_unittests_apk__create_incremental__package.ninja b/obj/content/test/content_unittests_apk__create_incremental__package.ninja
index e32715f..673dd82 100644
--- a/obj/content/test/content_unittests_apk__create_incremental__package.ninja
+++ b/obj/content/test/content_unittests_apk__create_incremental__package.ninja
@@ -23,5 +23,4 @@ build obj/content/test/content_unittests_apk__create_incremental__package.inputd
   gen/content/test/content_unittests_apk.build_config
   gen/content/test/content_unittests_apk/content_unittests_apk.apk_intermediates_incremental.ap_
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/content/test/content_unittests_apk__create_incremental__package_resources.ninja b/obj/content/test/content_unittests_apk__create_incremental__package_resources.ninja
index d7e35aa..32843d9 100644
--- a/obj/content/test/content_unittests_apk__create_incremental__package_resources.ninja
+++ b/obj/content/test/content_unittests_apk__create_incremental__package_resources.ninja
@@ -21,5 +21,4 @@ build obj/content/test/content_unittests_apk__create_incremental__package_resour
   gen/content/test/content_unittests_apk/content_unittests_apk.resources.all.zip
   gen/content/test/content_unittests_apk__create_incremental_generate_manifest/AndroidManifest.xml
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/content/test/content_unittests_apk__create_incremental_generate_manifest.ninja b/obj/content/test/content_unittests_apk__create_incremental_generate_manifest.ninja
index f45573b..36bf94f 100644
--- a/obj/content/test/content_unittests_apk__create_incremental_generate_manifest.ninja
+++ b/obj/content/test/content_unittests_apk__create_incremental_generate_manifest.ninja
@@ -20,5 +20,4 @@ build obj/content/test/content_unittests_apk__create_incremental_generate_manife
   clang_x86/obj/v8/js2c_experimental_extras.stamp
   clang_x86/obj/v8/js2c_extras.stamp
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/content/test/content_unittests_apk__java__compile_java__javac.ninja b/obj/content/test/content_unittests_apk__java__compile_java__javac.ninja
index b94716c..8dada95 100644
--- a/obj/content/test/content_unittests_apk__java__compile_java__javac.ninja
+++ b/obj/content/test/content_unittests_apk__java__compile_java__javac.ninja
@@ -28,5 +28,4 @@ build obj/content/test/content_unittests_apk__java__compile_java__javac.inputdep
   gen/content/test/content_unittests_apk__process_resources.srcjar
   lib.java/android.interface.jar
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/content/test/content_unittests_apk__java__lint.ninja b/obj/content/test/content_unittests_apk__java__lint.ninja
index 97c057e..da753a2 100644
--- a/obj/content/test/content_unittests_apk__java__lint.ninja
+++ b/obj/content/test/content_unittests_apk__java__lint.ninja
@@ -25,5 +25,4 @@ build obj/content/test/content_unittests_apk__java__lint.inputdeps.stamp:
   clang_x86/obj/v8/js2c_extras.stamp
   gen/content/test/content_unittests_apk/content_unittests_apk.jar
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/content/test/content_unittests_apk__process_resources.ninja b/obj/content/test/content_unittests_apk__process_resources.ninja
index b91b1c0..5b65eed 100644
--- a/obj/content/test/content_unittests_apk__process_resources.ninja
+++ b/obj/content/test/content_unittests_apk__process_resources.ninja
@@ -22,5 +22,4 @@ build obj/content/test/content_unittests_apk__process_resources.inputdeps.stamp:
   clang_x86/obj/v8/js2c_extras.stamp
   gen/content/test/content_unittests_apk.build_config
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/courgette/_courgette_unittests__library.ninja b/obj/courgette/_courgette_unittests__library.ninja
index 11bcca4..8f24758 100644
--- a/obj/courgette/_courgette_unittests__library.ninja
+++ b/obj/courgette/_courgette_unittests__library.ninja
@@ -14,5 +14,4 @@ target_output_name = lib_courgette_unittests__library
 build ./lib_courgette_unittests__library.so ./lib_courgette_unittests__library.so.TOC ./lib.unstripped/lib_courgette_unittests__library.so:
   ../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-androideabi/4.9/libgcc.a
-  obj/base/allocator/allocator.stamp
   obj/base/base_i18n.stamp
   obj/base/i18n/base_i18n_switches.o
diff --git a/obj/courgette/courgette_unittests_apk__build_config.ninja b/obj/courgette/courgette_unittests_apk__build_config.ninja
index 4f6f023..2a6ded5 100644
--- a/obj/courgette/courgette_unittests_apk__build_config.ninja
+++ b/obj/courgette/courgette_unittests_apk__build_config.ninja
@@ -1,4 +1,4 @@
 rule __courgette_courgette_unittests_apk__build_config___build_toolchain_android_arm__rule
   command = python ../../build/android/gyp/write_build_config.py --type android_apk --depfile gen/courgette/courgette_unittests_apk__build_config.d --possible-deps-configs=\[\"gen/courgette/courgette_lib.build_config\",\$ \"gen/base/base.build_config\",\$ \"gen/base/i18n.build_config\",\$
-\"gen/base/allocator/allocator.build_config\",\$
  \"gen/base/test/run_all_unittests.build_config\",\$ \"gen/base/test/test_support.build_config\",\$ \"gen/testing/gtest/gtest.build_config\",\$ \"gen/courgette/_courgette_unittests__library.build_config\",\$ \"gen/base/base_java.build_config\",\$ \"gen/testing/android/appurify_support/appurify_support_java.build_config\",\$ \"gen/testing/android/reporter/reporter_java.build_config\"\] --build-config gen/courgette/courgette_unittests_apk.build_config --jar-path gen/courgette/courgette_unittests_apk/courgette_unittests_apk.jar --dex-path gen/courgette/courgette_unittests_apk/classes.dex --supports-android --requires-android --resources-zip gen/courgette/courgette_unittests_apk/courgette_unittests_apk.resources.zip --android-manifest ../../testing/android/native_test/java/AndroidManifest.xml --native-libs=\[\"lib_courgette_unittests__library.so\"\] --readelf-path=../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-readelf --apk-path=courgette_unittests_apk/courgette_unittests-debug.apk
   description = ACTION //courgette:courgette_unittests_apk__build_config(//build/toolchain/android:arm)
   restat = 1
@@ -16,5 +16,4 @@ build obj/courgette/courgette_unittests_apk__build_config.inputdeps.stamp:
   ./lib_courgette_unittests__library.so.TOC
   lib_courgette_unittests__library.so
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/courgette/courgette_unittests_apk__create__package.ninja b/obj/courgette/courgette_unittests_apk__create__package.ninja
index b67f508..e1c697a 100644
--- a/obj/courgette/courgette_unittests_apk__create__package.ninja
+++ b/obj/courgette/courgette_unittests_apk__create__package.ninja
@@ -18,5 +18,4 @@ build obj/courgette/courgette_unittests_apk__create__package.inputdeps.stamp:
   gen/courgette/courgette_unittests_apk/classes.dex
   gen/courgette/courgette_unittests_apk/courgette_unittests_apk.apk_intermediates.ap_
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/courgette/courgette_unittests_apk__create__package_resources.ninja b/obj/courgette/courgette_unittests_apk__create__package_resources.ninja
index 1f4e4ab..bdabee9 100644
--- a/obj/courgette/courgette_unittests_apk__create__package_resources.ninja
+++ b/obj/courgette/courgette_unittests_apk__create__package_resources.ninja
@@ -16,5 +16,4 @@ build obj/courgette/courgette_unittests_apk__create__package_resources.inputdeps
   ./lib_courgette_unittests__library.so.TOC
   gen/courgette/courgette_unittests_apk/courgette_unittests_apk.resources.all.zip
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/courgette/courgette_unittests_apk__create_incremental__package.ninja b/obj/courgette/courgette_unittests_apk__create_incremental__package.ninja
index 18a17c7..c2b6bcf 100644
--- a/obj/courgette/courgette_unittests_apk__create_incremental__package.ninja
+++ b/obj/courgette/courgette_unittests_apk__create_incremental__package.ninja
@@ -18,5 +18,4 @@ build obj/courgette/courgette_unittests_apk__create_incremental__package.inputde
   gen/courgette/courgette_unittests_apk.build_config
   gen/courgette/courgette_unittests_apk/courgette_unittests_apk.apk_intermediates_incremental.ap_
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/courgette/courgette_unittests_apk__create_incremental__package_resources.ninja b/obj/courgette/courgette_unittests_apk__create_incremental__package_resources.ninja
index 4869a16..d059852 100644
--- a/obj/courgette/courgette_unittests_apk__create_incremental__package_resources.ninja
+++ b/obj/courgette/courgette_unittests_apk__create_incremental__package_resources.ninja
@@ -16,5 +16,4 @@ build obj/courgette/courgette_unittests_apk__create_incremental__package_resourc
   gen/courgette/courgette_unittests_apk/courgette_unittests_apk.resources.all.zip
   gen/courgette/courgette_unittests_apk__create_incremental_generate_manifest/AndroidManifest.xml
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/courgette/courgette_unittests_apk__create_incremental_generate_manifest.ninja b/obj/courgette/courgette_unittests_apk__create_incremental_generate_manifest.ninja
index 702a11d..0a00788 100644
--- a/obj/courgette/courgette_unittests_apk__create_incremental_generate_manifest.ninja
+++ b/obj/courgette/courgette_unittests_apk__create_incremental_generate_manifest.ninja
@@ -15,5 +15,4 @@ build obj/courgette/courgette_unittests_apk__create_incremental_generate_manifes
   ../../testing/android/native_test/java/AndroidManifest.xml
   ./lib_courgette_unittests__library.so.TOC
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/courgette/courgette_unittests_apk__java__compile_java__javac.ninja b/obj/courgette/courgette_unittests_apk__java__compile_java__javac.ninja
index 2610538..52e1518 100644
--- a/obj/courgette/courgette_unittests_apk__java__compile_java__javac.ninja
+++ b/obj/courgette/courgette_unittests_apk__java__compile_java__javac.ninja
@@ -23,5 +23,4 @@ build obj/courgette/courgette_unittests_apk__java__compile_java__javac.inputdeps
   gen/courgette/courgette_unittests_apk__process_resources.srcjar
   lib.java/android.interface.jar
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/courgette/courgette_unittests_apk__java__lint.ninja b/obj/courgette/courgette_unittests_apk__java__lint.ninja
index 3939259..2eab7e0 100644
--- a/obj/courgette/courgette_unittests_apk__java__lint.ninja
+++ b/obj/courgette/courgette_unittests_apk__java__lint.ninja
@@ -20,5 +20,4 @@ build obj/courgette/courgette_unittests_apk__java__lint.inputdeps.stamp:
   ./lib_courgette_unittests__library.so.TOC
   gen/courgette/courgette_unittests_apk/courgette_unittests_apk.jar
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/courgette/courgette_unittests_apk__process_resources.ninja b/obj/courgette/courgette_unittests_apk__process_resources.ninja
index 1c269c8..2fb852f 100644
--- a/obj/courgette/courgette_unittests_apk__process_resources.ninja
+++ b/obj/courgette/courgette_unittests_apk__process_resources.ninja
@@ -17,5 +17,4 @@ build obj/courgette/courgette_unittests_apk__process_resources.inputdeps.stamp:
   ./lib_courgette_unittests__library.so.TOC
   gen/courgette/courgette_unittests_apk.build_config
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/media/_media_unittests__library.ninja b/obj/media/_media_unittests__library.ninja
index fd071c8..a53a6b8 100644
--- a/obj/media/_media_unittests__library.ninja
+++ b/obj/media/_media_unittests__library.ninja
@@ -14,5 +14,4 @@ target_output_name = lib_media_unittests__library
 build ./lib_media_unittests__library.so ./lib_media_unittests__library.so.TOC ./lib.unstripped/lib_media_unittests__library.so:
   ../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-androideabi/4.9/libgcc.a
-  obj/base/allocator/allocator.stamp
   obj/base/base_i18n.stamp
   obj/base/i18n/base_i18n_switches.o
diff --git a/obj/media/media_unittests_apk__build_config.ninja b/obj/media/media_unittests_apk__build_config.ninja
index 7332062..ee3473b 100644
--- a/obj/media/media_unittests_apk__build_config.ninja
+++ b/obj/media/media_unittests_apk__build_config.ninja
@@ -1,4 +1,4 @@
 rule __media_media_unittests_apk__build_config___build_toolchain_android_arm__rule
   command = python ../../build/android/gyp/write_build_config.py --type android_apk --depfile gen/media/media_unittests_apk__build_config.d --possible-deps-configs=\[\"gen/media/media.build_config\",\$ \"gen/media/test_support.build_config\",\$
-\"gen/base/allocator/allocator.build_config\",\$
  \"gen/base/test/test_support.build_config\",\$ \"gen/gpu/test_support.build_config\",\$ \"gen/gpu/command_buffer/common/common.build_config\",\$ \"gen/media/audio/test_support.build_config\",\$ \"gen/media/audio/unittests.build_config\",\$ \"gen/media/base/test_support.build_config\",\$ \"gen/media/base/unittests.build_config\",\$ \"gen/media/test/pipeline_integration_tests.build_config\",\$ \"gen/skia/skia.build_config\",\$ \"gen/testing/gmock/gmock.build_config\",\$ \"gen/testing/gtest/gtest.build_config\",\$ \"gen/third_party/libwebm/libwebm.build_config\",\$ \"gen/third_party/libyuv/libyuv.build_config\",\$ \"gen/third_party/widevine/cdm/version_h.build_config\",\$ \"gen/ui/gfx/test_support.build_config\",\$ \"gen/url/url.build_config\",\$ \"gen/media/base/android/media_java.build_config\",\$ \"gen/media/base/android/unittests.build_config\",\$ \"gen/ui/android/ui_java.build_config\",\$ \"gen/third_party/ffmpeg/ffmpeg.build_config\",\$ \"gen/media/_media_unittests__library.build_config\",\$ \"gen/base/base_java.build_config\",\$ \"gen/testing/android/appurify_support/appurify_support_java.build_config\",\$ \"gen/testing/android/reporter/reporter_java.build_config\"\] --build-config gen/media/media_unittests_apk.build_config --jar-path gen/media/media_unittests_apk/media_unittests_apk.jar --dex-path gen/media/media_unittests_apk/classes.dex --supports-android --requires-android --resources-zip gen/media/media_unittests_apk/media_unittests_apk.resources.zip --android-manifest ../../testing/android/native_test/java/AndroidManifest.xml --native-libs=\[\"lib_media_unittests__library.so\"\] --readelf-path=../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-readelf --apk-path=media_unittests_apk/media_unittests-debug.apk
   description = ACTION //media:media_unittests_apk__build_config(//build/toolchain/android:arm)
   restat = 1
@@ -16,5 +16,4 @@ build obj/media/media_unittests_apk__build_config.inputdeps.stamp:
   ./lib_media_unittests__library.so.TOC
   lib_media_unittests__library.so
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/media/media_unittests_apk__create__package.ninja b/obj/media/media_unittests_apk__create__package.ninja
index 0974a00..321819b 100644
--- a/obj/media/media_unittests_apk__create__package.ninja
+++ b/obj/media/media_unittests_apk__create__package.ninja
@@ -18,5 +18,4 @@ build obj/media/media_unittests_apk__create__package.inputdeps.stamp:
   gen/media/media_unittests_apk/classes.dex
   gen/media/media_unittests_apk/media_unittests_apk.apk_intermediates.ap_
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/media/media_unittests_apk__create__package_resources.ninja b/obj/media/media_unittests_apk__create__package_resources.ninja
index 0f76f1d..29cadfe 100644
--- a/obj/media/media_unittests_apk__create__package_resources.ninja
+++ b/obj/media/media_unittests_apk__create__package_resources.ninja
@@ -16,5 +16,4 @@ build obj/media/media_unittests_apk__create__package_resources.inputdeps.stamp:
   ./lib_media_unittests__library.so.TOC
   gen/media/media_unittests_apk/media_unittests_apk.resources.all.zip
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/media/media_unittests_apk__create_incremental__package.ninja b/obj/media/media_unittests_apk__create_incremental__package.ninja
index b67f8a3..e2fc642 100644
--- a/obj/media/media_unittests_apk__create_incremental__package.ninja
+++ b/obj/media/media_unittests_apk__create_incremental__package.ninja
@@ -18,5 +18,4 @@ build obj/media/media_unittests_apk__create_incremental__package.inputdeps.stamp
   gen/media/media_unittests_apk.build_config
   gen/media/media_unittests_apk/media_unittests_apk.apk_intermediates_incremental.ap_
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/media/media_unittests_apk__create_incremental__package_resources.ninja b/obj/media/media_unittests_apk__create_incremental__package_resources.ninja
index 4f31edd..a0c632a 100644
--- a/obj/media/media_unittests_apk__create_incremental__package_resources.ninja
+++ b/obj/media/media_unittests_apk__create_incremental__package_resources.ninja
@@ -16,5 +16,4 @@ build obj/media/media_unittests_apk__create_incremental__package_resources.input
   gen/media/media_unittests_apk/media_unittests_apk.resources.all.zip
   gen/media/media_unittests_apk__create_incremental_generate_manifest/AndroidManifest.xml
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/media/media_unittests_apk__create_incremental_generate_manifest.ninja b/obj/media/media_unittests_apk__create_incremental_generate_manifest.ninja
index fbdad0b..7337761 100644
--- a/obj/media/media_unittests_apk__create_incremental_generate_manifest.ninja
+++ b/obj/media/media_unittests_apk__create_incremental_generate_manifest.ninja
@@ -15,5 +15,4 @@ build obj/media/media_unittests_apk__create_incremental_generate_manifest.inputd
   ../../testing/android/native_test/java/AndroidManifest.xml
   ./lib_media_unittests__library.so.TOC
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/media/media_unittests_apk__java__compile_java__javac.ninja b/obj/media/media_unittests_apk__java__compile_java__javac.ninja
index e569470..c4d5bdd 100644
--- a/obj/media/media_unittests_apk__java__compile_java__javac.ninja
+++ b/obj/media/media_unittests_apk__java__compile_java__javac.ninja
@@ -23,5 +23,4 @@ build obj/media/media_unittests_apk__java__compile_java__javac.inputdeps.stamp:
   gen/media/media_unittests_apk__process_resources.srcjar
   lib.java/android.interface.jar
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/media/media_unittests_apk__java__lint.ninja b/obj/media/media_unittests_apk__java__lint.ninja
index 43a05e4..b145703 100644
--- a/obj/media/media_unittests_apk__java__lint.ninja
+++ b/obj/media/media_unittests_apk__java__lint.ninja
@@ -20,5 +20,4 @@ build obj/media/media_unittests_apk__java__lint.inputdeps.stamp:
   ./lib_media_unittests__library.so.TOC
   gen/media/media_unittests_apk/media_unittests_apk.jar
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/media/media_unittests_apk__process_resources.ninja b/obj/media/media_unittests_apk__process_resources.ninja
index 7765fc6..903a508 100644
--- a/obj/media/media_unittests_apk__process_resources.ninja
+++ b/obj/media/media_unittests_apk__process_resources.ninja
@@ -17,5 +17,4 @@ build obj/media/media_unittests_apk__process_resources.inputdeps.stamp:
   ./lib_media_unittests__library.so.TOC
   gen/media/media_unittests_apk.build_config
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/net/_net_unittests__library.ninja b/obj/net/_net_unittests__library.ninja
index 43451ea..e1afc96 100644
--- a/obj/net/_net_unittests__library.ninja
+++ b/obj/net/_net_unittests__library.ninja
@@ -14,5 +14,4 @@ target_output_name = lib_net_unittests__library
 build ./lib_net_unittests__library.so ./lib_net_unittests__library.so.TOC ./lib.unstripped/lib_net_unittests__library.so:
   ../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-androideabi/4.9/libgcc.a
-  obj/base/allocator/allocator.stamp
   obj/base/base_i18n.stamp
   obj/base/base_java_unittest_support.stamp
diff --git a/obj/net/net_unittests_apk__build_config.ninja b/obj/net/net_unittests_apk__build_config.ninja
index 2e17c11..47691ab 100644
--- a/obj/net/net_unittests_apk__build_config.ninja
+++ b/obj/net/net_unittests_apk__build_config.ninja
@@ -1,4 +1,4 @@
 rule __net_net_unittests_apk__build_config___build_toolchain_android_arm__rule
   command = python ../../build/android/gyp/write_build_config.py --type android_apk --depfile gen/net/net_unittests_apk__build_config.d --possible-deps-configs=\[\"gen/net/balsa.build_config\",\$ \"gen/net/extras.build_config\",\$ \"gen/net/http_server.build_config\",\$ \"gen/net/net.build_config\",\$ \"gen/net/simple_quic_tools.build_config\",\$ \"gen/net/stale_while_revalidate_experiment_domains.build_config\",\$ \"gen/net/test_support.build_config\",\$ \"gen/base/base.build_config\",\$ \"gen/base/i18n.build_config\",\$ \"gen/base/prefs_test_support.build_config\",\$
-\"gen/base/allocator/allocator.build_config\",\$
  \"gen/base/third_party/dynamic_annotations/dynamic_annotations.build_config\",\$ \"gen/crypto/crypto.build_config\",\$ \"gen/crypto/platform.build_config\",\$ \"gen/crypto/test_support.build_config\",\$ \"gen/net/base/registry_controlled_domains/registry_controlled_domains.build_config\",\$ \"gen/sql/sql.build_config\",\$ \"gen/testing/gmock/gmock.build_config\",\$ \"gen/testing/gtest/gtest.build_config\",\$ \"gen/third_party/zlib/zlib.build_config\",\$ \"gen/url/url.build_config\",\$ \"gen/gin/gin.build_config\",\$ \"gen/net/net_with_v8.build_config\",\$ \"gen/net/net_test_jni_headers.build_config\",\$ \"gen/base/base_java_unittest_support.build_config\",\$ \"gen/net/android/net_java.build_config\",\$ \"gen/net/android/net_java_test_support.build_config\",\$ \"gen/net/android/net_javatests.build_config\",\$ \"gen/net/android/net_unittests_apk_resources.build_config\",\$ \"gen/testing/android/native_test/native_test_native_code.build_config\",\$ \"gen/v8/v8_external_startup_data_assets.build_config\",\$ \"gen/net/_net_unittests__library.build_config\",\$ \"gen/base/base_java.build_config\",\$ \"gen/testing/android/appurify_support/appurify_support_java.build_config\",\$ \"gen/testing/android/reporter/reporter_java.build_config\"\] --build-config gen/net/net_unittests_apk.build_config --jar-path gen/net/net_unittests_apk/net_unittests_apk.jar --dex-path gen/net/net_unittests_apk/classes.dex --supports-android --requires-android --resources-zip gen/net/net_unittests_apk/net_unittests_apk.resources.zip --android-manifest ../../net/android/unittest_support/AndroidManifest.xml --native-libs=\[\"lib_net_unittests__library.so\"\] --readelf-path=../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-readelf --apk-path=net_unittests_apk/net_unittests-debug.apk
   description = ACTION //net:net_unittests_apk__build_config(//build/toolchain/android:arm)
   restat = 1
@@ -21,5 +21,4 @@ build obj/net/net_unittests_apk__build_config.inputdeps.stamp:
   clang_x86/obj/v8/js2c_extras.stamp
   lib_net_unittests__library.so
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/net/net_unittests_apk__create__package.ninja b/obj/net/net_unittests_apk__create__package.ninja
index b67b0d5..7882106 100644
--- a/obj/net/net_unittests_apk__create__package.ninja
+++ b/obj/net/net_unittests_apk__create__package.ninja
@@ -23,5 +23,4 @@ build obj/net/net_unittests_apk__create__package.inputdeps.stamp:
   gen/net/net_unittests_apk/classes.dex
   gen/net/net_unittests_apk/net_unittests_apk.apk_intermediates.ap_
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/net/net_unittests_apk__create__package_resources.ninja b/obj/net/net_unittests_apk__create__package_resources.ninja
index 8cf0de2..95af603 100644
--- a/obj/net/net_unittests_apk__create__package_resources.ninja
+++ b/obj/net/net_unittests_apk__create__package_resources.ninja
@@ -21,5 +21,4 @@ build obj/net/net_unittests_apk__create__package_resources.inputdeps.stamp:
   clang_x86/obj/v8/js2c_extras.stamp
   gen/net/net_unittests_apk/net_unittests_apk.resources.all.zip
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/net/net_unittests_apk__create_incremental__package.ninja b/obj/net/net_unittests_apk__create_incremental__package.ninja
index 87bac71..225991f 100644
--- a/obj/net/net_unittests_apk__create_incremental__package.ninja
+++ b/obj/net/net_unittests_apk__create_incremental__package.ninja
@@ -23,5 +23,4 @@ build obj/net/net_unittests_apk__create_incremental__package.inputdeps.stamp:
   gen/net/net_unittests_apk.build_config
   gen/net/net_unittests_apk/net_unittests_apk.apk_intermediates_incremental.ap_
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/net/net_unittests_apk__create_incremental__package_resources.ninja b/obj/net/net_unittests_apk__create_incremental__package_resources.ninja
index d548f91..36beae7 100644
--- a/obj/net/net_unittests_apk__create_incremental__package_resources.ninja
+++ b/obj/net/net_unittests_apk__create_incremental__package_resources.ninja
@@ -21,5 +21,4 @@ build obj/net/net_unittests_apk__create_incremental__package_resources.inputdeps
   gen/net/net_unittests_apk/net_unittests_apk.resources.all.zip
   gen/net/net_unittests_apk__create_incremental_generate_manifest/AndroidManifest.xml
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/net/net_unittests_apk__create_incremental_generate_manifest.ninja b/obj/net/net_unittests_apk__create_incremental_generate_manifest.ninja
index ed33fa0..682d239 100644
--- a/obj/net/net_unittests_apk__create_incremental_generate_manifest.ninja
+++ b/obj/net/net_unittests_apk__create_incremental_generate_manifest.ninja
@@ -20,5 +20,4 @@ build obj/net/net_unittests_apk__create_incremental_generate_manifest.inputdeps.
   clang_x86/obj/v8/js2c_experimental_extras.stamp
   clang_x86/obj/v8/js2c_extras.stamp
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/net/net_unittests_apk__java__compile_java__javac.ninja b/obj/net/net_unittests_apk__java__compile_java__javac.ninja
index 2177757..c233872 100644
--- a/obj/net/net_unittests_apk__java__compile_java__javac.ninja
+++ b/obj/net/net_unittests_apk__java__compile_java__javac.ninja
@@ -28,5 +28,4 @@ build obj/net/net_unittests_apk__java__compile_java__javac.inputdeps.stamp:
   gen/net/net_unittests_apk__process_resources.srcjar
   lib.java/android.interface.jar
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/net/net_unittests_apk__java__lint.ninja b/obj/net/net_unittests_apk__java__lint.ninja
index 943bd83..4d39b5c 100644
--- a/obj/net/net_unittests_apk__java__lint.ninja
+++ b/obj/net/net_unittests_apk__java__lint.ninja
@@ -25,5 +25,4 @@ build obj/net/net_unittests_apk__java__lint.inputdeps.stamp:
   clang_x86/obj/v8/js2c_extras.stamp
   gen/net/net_unittests_apk/net_unittests_apk.jar
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/net/net_unittests_apk__process_resources.ninja b/obj/net/net_unittests_apk__process_resources.ninja
index 4e0f0e0..c33db99 100644
--- a/obj/net/net_unittests_apk__process_resources.ninja
+++ b/obj/net/net_unittests_apk__process_resources.ninja
@@ -22,5 +22,4 @@ build obj/net/net_unittests_apk__process_resources.inputdeps.stamp:
   clang_x86/obj/v8/js2c_extras.stamp
   gen/net/net_unittests_apk.build_config
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/printing/_printing_unittests__library.ninja b/obj/printing/_printing_unittests__library.ninja
index 8aa9f27..4389b41 100644
--- a/obj/printing/_printing_unittests__library.ninja
+++ b/obj/printing/_printing_unittests__library.ninja
@@ -14,5 +14,4 @@ target_output_name = lib_printing_unittests__library
 build ./lib_printing_unittests__library.so ./lib_printing_unittests__library.so.TOC ./lib.unstripped/lib_printing_unittests__library.so:
   ../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-androideabi/4.9/libgcc.a
-  obj/base/allocator/allocator.stamp
   obj/base/base_i18n.stamp
   obj/base/i18n/base_i18n_switches.o
diff --git a/obj/printing/printing_unittests_apk__build_config.ninja b/obj/printing/printing_unittests_apk__build_config.ninja
index b096b65..d3a1c60 100644
--- a/obj/printing/printing_unittests_apk__build_config.ninja
+++ b/obj/printing/printing_unittests_apk__build_config.ninja
@@ -1,4 +1,4 @@
 rule __printing_printing_unittests_apk__build_config___build_toolchain_android_arm__rule
   command = python ../../build/android/gyp/write_build_config.py --type android_apk --depfile gen/printing/printing_unittests_apk__build_config.d --possible-deps-configs=\[\"gen/printing/printing.build_config\",\$
-\"gen/base/allocator/allocator.build_config\",\$
  \"gen/base/test/run_all_unittests.build_config\",\$ \"gen/base/test/test_support.build_config\",\$ \"gen/testing/gtest/gtest.build_config\",\$ \"gen/ui/base/base.build_config\",\$ \"gen/ui/gfx/gfx.build_config\",\$ \"gen/ui/gfx/test_support.build_config\",\$ \"gen/ui/gfx/geometry/geometry.build_config\",\$ \"gen/printing/_printing_unittests__library.build_config\",\$ \"gen/base/base_java.build_config\",\$ \"gen/testing/android/appurify_support/appurify_support_java.build_config\",\$ \"gen/testing/android/reporter/reporter_java.build_config\"\] --build-config gen/printing/printing_unittests_apk.build_config --jar-path gen/printing/printing_unittests_apk/printing_unittests_apk.jar --dex-path gen/printing/printing_unittests_apk/classes.dex --supports-android --requires-android --resources-zip gen/printing/printing_unittests_apk/printing_unittests_apk.resources.zip --android-manifest ../../testing/android/native_test/java/AndroidManifest.xml --native-libs=\[\"lib_printing_unittests__library.so\"\] --readelf-path=../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-readelf --apk-path=printing_unittests_apk/printing_unittests-debug.apk
   description = ACTION //printing:printing_unittests_apk__build_config(//build/toolchain/android:arm)
   restat = 1
@@ -16,5 +16,4 @@ build obj/printing/printing_unittests_apk__build_config.inputdeps.stamp:
   ./lib_printing_unittests__library.so.TOC
   lib_printing_unittests__library.so
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/printing/printing_unittests_apk__create__package.ninja b/obj/printing/printing_unittests_apk__create__package.ninja
index ca13939..c3c73c0 100644
--- a/obj/printing/printing_unittests_apk__create__package.ninja
+++ b/obj/printing/printing_unittests_apk__create__package.ninja
@@ -18,5 +18,4 @@ build obj/printing/printing_unittests_apk__create__package.inputdeps.stamp:
   gen/printing/printing_unittests_apk/classes.dex
   gen/printing/printing_unittests_apk/printing_unittests_apk.apk_intermediates.ap_
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/printing/printing_unittests_apk__create__package_resources.ninja b/obj/printing/printing_unittests_apk__create__package_resources.ninja
index a3d50e2..24236d4 100644
--- a/obj/printing/printing_unittests_apk__create__package_resources.ninja
+++ b/obj/printing/printing_unittests_apk__create__package_resources.ninja
@@ -16,5 +16,4 @@ build obj/printing/printing_unittests_apk__create__package_resources.inputdeps.s
   ./lib_printing_unittests__library.so.TOC
   gen/printing/printing_unittests_apk/printing_unittests_apk.resources.all.zip
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/printing/printing_unittests_apk__create_incremental__package.ninja b/obj/printing/printing_unittests_apk__create_incremental__package.ninja
index eed4587..a9e36fe 100644
--- a/obj/printing/printing_unittests_apk__create_incremental__package.ninja
+++ b/obj/printing/printing_unittests_apk__create_incremental__package.ninja
@@ -18,5 +18,4 @@ build obj/printing/printing_unittests_apk__create_incremental__package.inputdeps
   gen/printing/printing_unittests_apk.build_config
   gen/printing/printing_unittests_apk/printing_unittests_apk.apk_intermediates_incremental.ap_
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/printing/printing_unittests_apk__create_incremental__package_resources.ninja b/obj/printing/printing_unittests_apk__create_incremental__package_resources.ninja
index 63be73d..5b2e45a 100644
--- a/obj/printing/printing_unittests_apk__create_incremental__package_resources.ninja
+++ b/obj/printing/printing_unittests_apk__create_incremental__package_resources.ninja
@@ -16,5 +16,4 @@ build obj/printing/printing_unittests_apk__create_incremental__package_resources
   gen/printing/printing_unittests_apk/printing_unittests_apk.resources.all.zip
   gen/printing/printing_unittests_apk__create_incremental_generate_manifest/AndroidManifest.xml
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/printing/printing_unittests_apk__create_incremental_generate_manifest.ninja b/obj/printing/printing_unittests_apk__create_incremental_generate_manifest.ninja
index 4e101b7..3ac1380 100644
--- a/obj/printing/printing_unittests_apk__create_incremental_generate_manifest.ninja
+++ b/obj/printing/printing_unittests_apk__create_incremental_generate_manifest.ninja
@@ -15,5 +15,4 @@ build obj/printing/printing_unittests_apk__create_incremental_generate_manifest.
   ../../testing/android/native_test/java/AndroidManifest.xml
   ./lib_printing_unittests__library.so.TOC
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/printing/printing_unittests_apk__java__compile_java__javac.ninja b/obj/printing/printing_unittests_apk__java__compile_java__javac.ninja
index 72243b0..3e7bbf7 100644
--- a/obj/printing/printing_unittests_apk__java__compile_java__javac.ninja
+++ b/obj/printing/printing_unittests_apk__java__compile_java__javac.ninja
@@ -23,5 +23,4 @@ build obj/printing/printing_unittests_apk__java__compile_java__javac.inputdeps.s
   gen/printing/printing_unittests_apk__process_resources.srcjar
   lib.java/android.interface.jar
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/printing/printing_unittests_apk__java__lint.ninja b/obj/printing/printing_unittests_apk__java__lint.ninja
index a5b655b..f1bcf35 100644
--- a/obj/printing/printing_unittests_apk__java__lint.ninja
+++ b/obj/printing/printing_unittests_apk__java__lint.ninja
@@ -20,5 +20,4 @@ build obj/printing/printing_unittests_apk__java__lint.inputdeps.stamp:
   ./lib_printing_unittests__library.so.TOC
   gen/printing/printing_unittests_apk/printing_unittests_apk.jar
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/printing/printing_unittests_apk__process_resources.ninja b/obj/printing/printing_unittests_apk__process_resources.ninja
index 46bb779..ad89920 100644
--- a/obj/printing/printing_unittests_apk__process_resources.ninja
+++ b/obj/printing/printing_unittests_apk__process_resources.ninja
@@ -17,5 +17,4 @@ build obj/printing/printing_unittests_apk__process_resources.inputdeps.stamp:
   ./lib_printing_unittests__library.so.TOC
   gen/printing/printing_unittests_apk.build_config
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/sql/_sql_unittests__library.ninja b/obj/sql/_sql_unittests__library.ninja
index cca7cd0..2b9f770 100644
--- a/obj/sql/_sql_unittests__library.ninja
+++ b/obj/sql/_sql_unittests__library.ninja
@@ -14,5 +14,4 @@ target_output_name = lib_sql_unittests__library
 build ./lib_sql_unittests__library.so ./lib_sql_unittests__library.so.TOC ./lib.unstripped/lib_sql_unittests__library.so:
   ../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-androideabi/4.9/libgcc.a
-  obj/base/allocator/allocator.stamp
   obj/base/base_i18n.stamp
   obj/base/i18n/base_i18n_switches.o
diff --git a/obj/sql/sql_unittests_apk__build_config.ninja b/obj/sql/sql_unittests_apk__build_config.ninja
index dec5eef..c03350f 100644
--- a/obj/sql/sql_unittests_apk__build_config.ninja
+++ b/obj/sql/sql_unittests_apk__build_config.ninja
@@ -1,4 +1,4 @@
 rule __sql_sql_unittests_apk__build_config___build_toolchain_android_arm__rule
   command = python ../../build/android/gyp/write_build_config.py --type android_apk --depfile gen/sql/sql_unittests_apk__build_config.d --possible-deps-configs=\[\"gen/sql/redirection_header.build_config\",\$ \"gen/sql/sql.build_config\",\$ \"gen/sql/test_support.build_config\",\$
-\"gen/base/allocator/allocator.build_config\",\$
  \"gen/base/test/test_support.build_config\",\$ \"gen/testing/gtest/gtest.build_config\",\$ \"gen/third_party/sqlite/sqlite.build_config\",\$ \"gen/sql/_sql_unittests__library.build_config\",\$ \"gen/base/base_java.build_config\",\$ \"gen/testing/android/appurify_support/appurify_support_java.build_config\",\$ \"gen/testing/android/reporter/reporter_java.build_config\"\] --build-config gen/sql/sql_unittests_apk.build_config --jar-path gen/sql/sql_unittests_apk/sql_unittests_apk.jar --dex-path gen/sql/sql_unittests_apk/classes.dex --supports-android --requires-android --resources-zip gen/sql/sql_unittests_apk/sql_unittests_apk.resources.zip --android-manifest ../../testing/android/native_test/java/AndroidManifest.xml --native-libs=\[\"lib_sql_unittests__library.so\"\] --readelf-path=../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-readelf --apk-path=sql_unittests_apk/sql_unittests-debug.apk
   description = ACTION //sql:sql_unittests_apk__build_config(//build/toolchain/android:arm)
   restat = 1
@@ -16,5 +16,4 @@ build obj/sql/sql_unittests_apk__build_config.inputdeps.stamp:
   ./lib_sql_unittests__library.so.TOC
   lib_sql_unittests__library.so
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/sql/sql_unittests_apk__create__package.ninja b/obj/sql/sql_unittests_apk__create__package.ninja
index de81f57..22bfdb0 100644
--- a/obj/sql/sql_unittests_apk__create__package.ninja
+++ b/obj/sql/sql_unittests_apk__create__package.ninja
@@ -18,5 +18,4 @@ build obj/sql/sql_unittests_apk__create__package.inputdeps.stamp:
   gen/sql/sql_unittests_apk/classes.dex
   gen/sql/sql_unittests_apk/sql_unittests_apk.apk_intermediates.ap_
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/sql/sql_unittests_apk__create__package_resources.ninja b/obj/sql/sql_unittests_apk__create__package_resources.ninja
index 907f4bb..80776c2 100644
--- a/obj/sql/sql_unittests_apk__create__package_resources.ninja
+++ b/obj/sql/sql_unittests_apk__create__package_resources.ninja
@@ -16,5 +16,4 @@ build obj/sql/sql_unittests_apk__create__package_resources.inputdeps.stamp:
   ./lib_sql_unittests__library.so.TOC
   gen/sql/sql_unittests_apk/sql_unittests_apk.resources.all.zip
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/sql/sql_unittests_apk__create_incremental__package.ninja b/obj/sql/sql_unittests_apk__create_incremental__package.ninja
index d609694..75a7ed3 100644
--- a/obj/sql/sql_unittests_apk__create_incremental__package.ninja
+++ b/obj/sql/sql_unittests_apk__create_incremental__package.ninja
@@ -18,5 +18,4 @@ build obj/sql/sql_unittests_apk__create_incremental__package.inputdeps.stamp:
   gen/sql/sql_unittests_apk.build_config
   gen/sql/sql_unittests_apk/sql_unittests_apk.apk_intermediates_incremental.ap_
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/sql/sql_unittests_apk__create_incremental__package_resources.ninja b/obj/sql/sql_unittests_apk__create_incremental__package_resources.ninja
index 61fa16d..c444dfb 100644
--- a/obj/sql/sql_unittests_apk__create_incremental__package_resources.ninja
+++ b/obj/sql/sql_unittests_apk__create_incremental__package_resources.ninja
@@ -16,5 +16,4 @@ build obj/sql/sql_unittests_apk__create_incremental__package_resources.inputdeps
   gen/sql/sql_unittests_apk/sql_unittests_apk.resources.all.zip
   gen/sql/sql_unittests_apk__create_incremental_generate_manifest/AndroidManifest.xml
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/sql/sql_unittests_apk__create_incremental_generate_manifest.ninja b/obj/sql/sql_unittests_apk__create_incremental_generate_manifest.ninja
index 9b221ce..e035762 100644
--- a/obj/sql/sql_unittests_apk__create_incremental_generate_manifest.ninja
+++ b/obj/sql/sql_unittests_apk__create_incremental_generate_manifest.ninja
@@ -15,5 +15,4 @@ build obj/sql/sql_unittests_apk__create_incremental_generate_manifest.inputdeps.
   ../../testing/android/native_test/java/AndroidManifest.xml
   ./lib_sql_unittests__library.so.TOC
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/sql/sql_unittests_apk__java__compile_java__javac.ninja b/obj/sql/sql_unittests_apk__java__compile_java__javac.ninja
index 1865420..8d153dc 100644
--- a/obj/sql/sql_unittests_apk__java__compile_java__javac.ninja
+++ b/obj/sql/sql_unittests_apk__java__compile_java__javac.ninja
@@ -23,5 +23,4 @@ build obj/sql/sql_unittests_apk__java__compile_java__javac.inputdeps.stamp:
   gen/sql/sql_unittests_apk__process_resources.srcjar
   lib.java/android.interface.jar
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/sql/sql_unittests_apk__java__lint.ninja b/obj/sql/sql_unittests_apk__java__lint.ninja
index fac5aa1..a3985b4 100644
--- a/obj/sql/sql_unittests_apk__java__lint.ninja
+++ b/obj/sql/sql_unittests_apk__java__lint.ninja
@@ -20,5 +20,4 @@ build obj/sql/sql_unittests_apk__java__lint.inputdeps.stamp:
   ./lib_sql_unittests__library.so.TOC
   gen/sql/sql_unittests_apk/sql_unittests_apk.jar
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/sql/sql_unittests_apk__process_resources.ninja b/obj/sql/sql_unittests_apk__process_resources.ninja
index 6eb18d6..bcf94f3 100644
--- a/obj/sql/sql_unittests_apk__process_resources.ninja
+++ b/obj/sql/sql_unittests_apk__process_resources.ninja
@@ -17,5 +17,4 @@ build obj/sql/sql_unittests_apk__process_resources.inputdeps.stamp:
   ./lib_sql_unittests__library.so.TOC
   gen/sql/sql_unittests_apk.build_config
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/sync/_sync_unit_tests__library.ninja b/obj/sync/_sync_unit_tests__library.ninja
index 5e3a2a8..e2ccac8 100644
--- a/obj/sync/_sync_unit_tests__library.ninja
+++ b/obj/sync/_sync_unit_tests__library.ninja
@@ -14,5 +14,4 @@ target_output_name = lib_sync_unit_tests__library
 build ./lib_sync_unit_tests__library.so ./lib_sync_unit_tests__library.so.TOC ./lib.unstripped/lib_sync_unit_tests__library.so:
   ../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-androideabi/4.9/libgcc.a
-  obj/base/allocator/allocator.stamp
   obj/base/base_i18n.stamp
   obj/base/i18n/base_i18n_switches.o
diff --git a/obj/sync/sync_unit_tests_apk__build_config.ninja b/obj/sync/sync_unit_tests_apk__build_config.ninja
index 050148d..b6b1482 100644
--- a/obj/sync/sync_unit_tests_apk__build_config.ninja
+++ b/obj/sync/sync_unit_tests_apk__build_config.ninja
@@ -1,4 +1,4 @@
 rule __sync_sync_unit_tests_apk__build_config___build_toolchain_android_arm__rule
   command = python ../../build/android/gyp/write_build_config.py --type android_apk --depfile gen/sync/sync_unit_tests_apk__build_config.d --possible-deps-configs=\[\"gen/sync/test_support_sync_core.build_config\",\$ \"gen/sync/test_support_sync_internal_api.build_config\",\$ \"gen/base/base.build_config\",\$
-\"gen/base/allocator/allocator.build_config\",\$
  \"gen/base/test/run_all_unittests.build_config\",\$ \"gen/google_apis/google_apis.build_config\",\$ \"gen/google_apis/test_support.build_config\",\$ \"gen/net/net.build_config\",\$ \"gen/net/test_support.build_config\",\$ \"gen/sql/sql.build_config\",\$ \"gen/sql/test_support.build_config\",\$ \"gen/sync/sync.build_config\",\$ \"gen/sync/protocol/protocol.build_config\",\$ \"gen/testing/gmock/gmock.build_config\",\$ \"gen/testing/gtest/gtest.build_config\",\$ \"gen/third_party/leveldatabase/leveldatabase.build_config\",\$ \"gen/third_party/protobuf/protobuf_lite.build_config\",\$ \"gen/third_party/zlib/zlib.build_config\",\$ \"gen/sync/_sync_unit_tests__library.build_config\",\$ \"gen/base/base_java.build_config\",\$ \"gen/testing/android/appurify_support/appurify_support_java.build_config\",\$ \"gen/testing/android/reporter/reporter_java.build_config\"\] --build-config gen/sync/sync_unit_tests_apk.build_config --jar-path gen/sync/sync_unit_tests_apk/sync_unit_tests_apk.jar --dex-path gen/sync/sync_unit_tests_apk/classes.dex --supports-android --requires-android --resources-zip gen/sync/sync_unit_tests_apk/sync_unit_tests_apk.resources.zip --android-manifest ../../testing/android/native_test/java/AndroidManifest.xml --native-libs=\[\"lib_sync_unit_tests__library.so\"\] --readelf-path=../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-readelf --apk-path=sync_unit_tests_apk/sync_unit_tests-debug.apk
   description = ACTION //sync:sync_unit_tests_apk__build_config(//build/toolchain/android:arm)
   restat = 1
@@ -21,5 +21,4 @@ build obj/sync/sync_unit_tests_apk__build_config.inputdeps.stamp:
   clang_x86/obj/v8/js2c_extras.stamp
   lib_sync_unit_tests__library.so
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/sync/sync_unit_tests_apk__create__package.ninja b/obj/sync/sync_unit_tests_apk__create__package.ninja
index 010497b..8e5e9df 100644
--- a/obj/sync/sync_unit_tests_apk__create__package.ninja
+++ b/obj/sync/sync_unit_tests_apk__create__package.ninja
@@ -23,5 +23,4 @@ build obj/sync/sync_unit_tests_apk__create__package.inputdeps.stamp:
   gen/sync/sync_unit_tests_apk/classes.dex
   gen/sync/sync_unit_tests_apk/sync_unit_tests_apk.apk_intermediates.ap_
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/sync/sync_unit_tests_apk__create__package_resources.ninja b/obj/sync/sync_unit_tests_apk__create__package_resources.ninja
index eb49014..b12185a 100644
--- a/obj/sync/sync_unit_tests_apk__create__package_resources.ninja
+++ b/obj/sync/sync_unit_tests_apk__create__package_resources.ninja
@@ -21,5 +21,4 @@ build obj/sync/sync_unit_tests_apk__create__package_resources.inputdeps.stamp:
   clang_x86/obj/v8/js2c_extras.stamp
   gen/sync/sync_unit_tests_apk/sync_unit_tests_apk.resources.all.zip
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/sync/sync_unit_tests_apk__create_incremental__package.ninja b/obj/sync/sync_unit_tests_apk__create_incremental__package.ninja
index 2a4950d..eb5c9ac 100644
--- a/obj/sync/sync_unit_tests_apk__create_incremental__package.ninja
+++ b/obj/sync/sync_unit_tests_apk__create_incremental__package.ninja
@@ -23,5 +23,4 @@ build obj/sync/sync_unit_tests_apk__create_incremental__package.inputdeps.stamp:
   gen/sync/sync_unit_tests_apk.build_config
   gen/sync/sync_unit_tests_apk/sync_unit_tests_apk.apk_intermediates_incremental.ap_
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/sync/sync_unit_tests_apk__create_incremental__package_resources.ninja b/obj/sync/sync_unit_tests_apk__create_incremental__package_resources.ninja
index f41ee82..b13b901 100644
--- a/obj/sync/sync_unit_tests_apk__create_incremental__package_resources.ninja
+++ b/obj/sync/sync_unit_tests_apk__create_incremental__package_resources.ninja
@@ -21,5 +21,4 @@ build obj/sync/sync_unit_tests_apk__create_incremental__package_resources.inputd
   gen/sync/sync_unit_tests_apk/sync_unit_tests_apk.resources.all.zip
   gen/sync/sync_unit_tests_apk__create_incremental_generate_manifest/AndroidManifest.xml
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/sync/sync_unit_tests_apk__create_incremental_generate_manifest.ninja b/obj/sync/sync_unit_tests_apk__create_incremental_generate_manifest.ninja
index abb1f96..bab9e06 100644
--- a/obj/sync/sync_unit_tests_apk__create_incremental_generate_manifest.ninja
+++ b/obj/sync/sync_unit_tests_apk__create_incremental_generate_manifest.ninja
@@ -20,5 +20,4 @@ build obj/sync/sync_unit_tests_apk__create_incremental_generate_manifest.inputde
   clang_x86/obj/v8/js2c_experimental_extras.stamp
   clang_x86/obj/v8/js2c_extras.stamp
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/sync/sync_unit_tests_apk__java__compile_java__javac.ninja b/obj/sync/sync_unit_tests_apk__java__compile_java__javac.ninja
index a7c3118..218a944 100644
--- a/obj/sync/sync_unit_tests_apk__java__compile_java__javac.ninja
+++ b/obj/sync/sync_unit_tests_apk__java__compile_java__javac.ninja
@@ -28,5 +28,4 @@ build obj/sync/sync_unit_tests_apk__java__compile_java__javac.inputdeps.stamp:
   gen/sync/sync_unit_tests_apk__process_resources.srcjar
   lib.java/android.interface.jar
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/sync/sync_unit_tests_apk__java__lint.ninja b/obj/sync/sync_unit_tests_apk__java__lint.ninja
index 9658646..d45a4a1 100644
--- a/obj/sync/sync_unit_tests_apk__java__lint.ninja
+++ b/obj/sync/sync_unit_tests_apk__java__lint.ninja
@@ -25,5 +25,4 @@ build obj/sync/sync_unit_tests_apk__java__lint.inputdeps.stamp:
   clang_x86/obj/v8/js2c_extras.stamp
   gen/sync/sync_unit_tests_apk/sync_unit_tests_apk.jar
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/sync/sync_unit_tests_apk__process_resources.ninja b/obj/sync/sync_unit_tests_apk__process_resources.ninja
index fc3dfcb..d2900a3 100644
--- a/obj/sync/sync_unit_tests_apk__process_resources.ninja
+++ b/obj/sync/sync_unit_tests_apk__process_resources.ninja
@@ -22,5 +22,4 @@ build obj/sync/sync_unit_tests_apk__process_resources.inputdeps.stamp:
   clang_x86/obj/v8/js2c_extras.stamp
   gen/sync/sync_unit_tests_apk.build_config
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/third_party/WebKit/Source/platform/_blink_heap_unittests__library.ninja b/obj/third_party/WebKit/Source/platform/_blink_heap_unittests__library.ninja
index b479730..dc50972 100644
--- a/obj/third_party/WebKit/Source/platform/_blink_heap_unittests__library.ninja
+++ b/obj/third_party/WebKit/Source/platform/_blink_heap_unittests__library.ninja
@@ -14,5 +14,4 @@ target_output_name = lib_blink_heap_unittests__library
 build ./lib_blink_heap_unittests__library.so ./lib_blink_heap_unittests__library.so.TOC ./lib.unstripped/lib_blink_heap_unittests__library.so:
   ../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-androideabi/4.9/libgcc.a
-  obj/base/allocator/allocator.stamp
   obj/base/base_i18n.stamp
   obj/base/base_java.stamp
diff --git a/obj/third_party/WebKit/Source/platform/_blink_platform_unittests__library.ninja b/obj/third_party/WebKit/Source/platform/_blink_platform_unittests__library.ninja
index f266703..32a248c 100644
--- a/obj/third_party/WebKit/Source/platform/_blink_platform_unittests__library.ninja
+++ b/obj/third_party/WebKit/Source/platform/_blink_platform_unittests__library.ninja
@@ -14,5 +14,4 @@ target_output_name = lib_blink_platform_unittests__library
 build ./lib_blink_platform_unittests__library.so ./lib_blink_platform_unittests__library.so.TOC ./lib.unstripped/lib_blink_platform_unittests__library.so:
   ../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-androideabi/4.9/libgcc.a
-  obj/base/allocator/allocator.stamp
   obj/base/base_i18n.stamp
   obj/base/i18n/base_i18n_switches.o
diff --git a/obj/third_party/WebKit/Source/platform/blink_heap_unittests_apk__build_config.ninja b/obj/third_party/WebKit/Source/platform/blink_heap_unittests_apk__build_config.ninja
index f4c4bdc..5f1d2da 100644
--- a/obj/third_party/WebKit/Source/platform/blink_heap_unittests_apk__build_config.ninja
+++ b/obj/third_party/WebKit/Source/platform/blink_heap_unittests_apk__build_config.ninja
@@ -1,4 +1,4 @@
 rule __third_party_WebKit_Source_platform_blink_heap_unittests_apk__build_config___build_toolchain_android_arm__rule
   command = python ../../build/android/gyp/write_build_config.py --type android_apk --depfile gen/third_party/WebKit/Source/platform/blink_heap_unittests_apk__build_config.d --possible-deps-configs=\[\"gen/third_party/WebKit/Source/platform/platform.build_config\",\$ \"gen/base/base.build_config\",\$
-\"gen/base/allocator/allocator.build_config\",\$
  \"gen/base/test/test_support.build_config\",\$ \"gen/content/test/test_support.build_config\",\$ \"gen/testing/gmock/gmock.build_config\",\$ \"gen/testing/gtest/gtest.build_config\",\$ \"gen/third_party/WebKit/Source/wtf/wtf.build_config\",\$ \"gen/third_party/WebKit/Source/wtf/test_support.build_config\",\$ \"gen/base/base_java.build_config\",\$ \"gen/content/shell/android/content_shell_assets.build_config\",\$ \"gen/net/android/net_java.build_config\",\$ \"gen/third_party/WebKit/Source/platform/_blink_heap_unittests__library.build_config\",\$ \"gen/base/base_java.build_config\",\$ \"gen/testing/android/appurify_support/appurify_support_java.build_config\",\$ \"gen/testing/android/reporter/reporter_java.build_config\"\] --build-config gen/third_party/WebKit/Source/platform/blink_heap_unittests_apk.build_config --jar-path gen/third_party/WebKit/Source/platform/blink_heap_unittests_apk/blink_heap_unittests_apk.jar --dex-path gen/third_party/WebKit/Source/platform/blink_heap_unittests_apk/classes.dex --supports-android --requires-android --resources-zip gen/third_party/WebKit/Source/platform/blink_heap_unittests_apk/blink_heap_unittests_apk.resources.zip --android-manifest ../../testing/android/native_test/java/AndroidManifest.xml --native-libs=\[\"lib_blink_heap_unittests__library.so\"\] --readelf-path=../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-readelf --apk-path=blink_heap_unittests_apk/blink_heap_unittests-debug.apk
   description = ACTION //third_party/WebKit/Source/platform:blink_heap_unittests_apk__build_config(//build/toolchain/android:arm)
   restat = 1
@@ -21,5 +21,4 @@ build obj/third_party/WebKit/Source/platform/blink_heap_unittests_apk__build_con
   clang_x86/obj/v8/js2c_extras.stamp
   lib_blink_heap_unittests__library.so
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/third_party/WebKit/Source/platform/blink_heap_unittests_apk__create__package.ninja b/obj/third_party/WebKit/Source/platform/blink_heap_unittests_apk__create__package.ninja
index e7e7333..2329cf1 100644
--- a/obj/third_party/WebKit/Source/platform/blink_heap_unittests_apk__create__package.ninja
+++ b/obj/third_party/WebKit/Source/platform/blink_heap_unittests_apk__create__package.ninja
@@ -23,5 +23,4 @@ build obj/third_party/WebKit/Source/platform/blink_heap_unittests_apk__create__p
   gen/third_party/WebKit/Source/platform/blink_heap_unittests_apk/blink_heap_unittests_apk.apk_intermediates.ap_
   gen/third_party/WebKit/Source/platform/blink_heap_unittests_apk/classes.dex
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/third_party/WebKit/Source/platform/blink_heap_unittests_apk__create__package_resources.ninja b/obj/third_party/WebKit/Source/platform/blink_heap_unittests_apk__create__package_resources.ninja
index 901458e..bdd4256 100644
--- a/obj/third_party/WebKit/Source/platform/blink_heap_unittests_apk__create__package_resources.ninja
+++ b/obj/third_party/WebKit/Source/platform/blink_heap_unittests_apk__create__package_resources.ninja
@@ -21,5 +21,4 @@ build obj/third_party/WebKit/Source/platform/blink_heap_unittests_apk__create__p
   clang_x86/obj/v8/js2c_extras.stamp
   gen/third_party/WebKit/Source/platform/blink_heap_unittests_apk/blink_heap_unittests_apk.resources.all.zip
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/third_party/WebKit/Source/platform/blink_heap_unittests_apk__create_incremental__package.ninja b/obj/third_party/WebKit/Source/platform/blink_heap_unittests_apk__create_incremental__package.ninja
index afe5e0b..b768a2b 100644
--- a/obj/third_party/WebKit/Source/platform/blink_heap_unittests_apk__create_incremental__package.ninja
+++ b/obj/third_party/WebKit/Source/platform/blink_heap_unittests_apk__create_incremental__package.ninja
@@ -23,5 +23,4 @@ build obj/third_party/WebKit/Source/platform/blink_heap_unittests_apk__create_in
   gen/third_party/WebKit/Source/platform/blink_heap_unittests_apk.build_config
   gen/third_party/WebKit/Source/platform/blink_heap_unittests_apk/blink_heap_unittests_apk.apk_intermediates_incremental.ap_
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/third_party/WebKit/Source/platform/blink_heap_unittests_apk__create_incremental__package_resources.ninja b/obj/third_party/WebKit/Source/platform/blink_heap_unittests_apk__create_incremental__package_resources.ninja
index e1b1e0b..c2e219e 100644
--- a/obj/third_party/WebKit/Source/platform/blink_heap_unittests_apk__create_incremental__package_resources.ninja
+++ b/obj/third_party/WebKit/Source/platform/blink_heap_unittests_apk__create_incremental__package_resources.ninja
@@ -21,5 +21,4 @@ build obj/third_party/WebKit/Source/platform/blink_heap_unittests_apk__create_in
   gen/third_party/WebKit/Source/platform/blink_heap_unittests_apk/blink_heap_unittests_apk.resources.all.zip
   gen/third_party/WebKit/Source/platform/blink_heap_unittests_apk__create_incremental_generate_manifest/AndroidManifest.xml
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/third_party/WebKit/Source/platform/blink_heap_unittests_apk__create_incremental_generate_manifest.ninja b/obj/third_party/WebKit/Source/platform/blink_heap_unittests_apk__create_incremental_generate_manifest.ninja
index 16822d2..6f6337f 100644
--- a/obj/third_party/WebKit/Source/platform/blink_heap_unittests_apk__create_incremental_generate_manifest.ninja
+++ b/obj/third_party/WebKit/Source/platform/blink_heap_unittests_apk__create_incremental_generate_manifest.ninja
@@ -20,5 +20,4 @@ build obj/third_party/WebKit/Source/platform/blink_heap_unittests_apk__create_in
   clang_x86/obj/v8/js2c_experimental_extras.stamp
   clang_x86/obj/v8/js2c_extras.stamp
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/third_party/WebKit/Source/platform/blink_heap_unittests_apk__java__compile_java__javac.ninja b/obj/third_party/WebKit/Source/platform/blink_heap_unittests_apk__java__compile_java__javac.ninja
index 98de77f..dc466be 100644
--- a/obj/third_party/WebKit/Source/platform/blink_heap_unittests_apk__java__compile_java__javac.ninja
+++ b/obj/third_party/WebKit/Source/platform/blink_heap_unittests_apk__java__compile_java__javac.ninja
@@ -28,5 +28,4 @@ build obj/third_party/WebKit/Source/platform/blink_heap_unittests_apk__java__com
   gen/third_party/WebKit/Source/platform/blink_heap_unittests_apk__process_resources.srcjar
   lib.java/android.interface.jar
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/third_party/WebKit/Source/platform/blink_heap_unittests_apk__java__lint.ninja b/obj/third_party/WebKit/Source/platform/blink_heap_unittests_apk__java__lint.ninja
index a49d8ba..6be26af 100644
--- a/obj/third_party/WebKit/Source/platform/blink_heap_unittests_apk__java__lint.ninja
+++ b/obj/third_party/WebKit/Source/platform/blink_heap_unittests_apk__java__lint.ninja
@@ -25,5 +25,4 @@ build obj/third_party/WebKit/Source/platform/blink_heap_unittests_apk__java__lin
   clang_x86/obj/v8/js2c_extras.stamp
   gen/third_party/WebKit/Source/platform/blink_heap_unittests_apk/blink_heap_unittests_apk.jar
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/third_party/WebKit/Source/platform/blink_heap_unittests_apk__process_resources.ninja b/obj/third_party/WebKit/Source/platform/blink_heap_unittests_apk__process_resources.ninja
index 25e66c8..d5cd379 100644
--- a/obj/third_party/WebKit/Source/platform/blink_heap_unittests_apk__process_resources.ninja
+++ b/obj/third_party/WebKit/Source/platform/blink_heap_unittests_apk__process_resources.ninja
@@ -22,5 +22,4 @@ build obj/third_party/WebKit/Source/platform/blink_heap_unittests_apk__process_r
   clang_x86/obj/v8/js2c_extras.stamp
   gen/third_party/WebKit/Source/platform/blink_heap_unittests_apk.build_config
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/third_party/WebKit/Source/platform/blink_platform_unittests_apk__build_config.ninja b/obj/third_party/WebKit/Source/platform/blink_platform_unittests_apk__build_config.ninja
index 64ed47a..f887b17 100644
--- a/obj/third_party/WebKit/Source/platform/blink_platform_unittests_apk__build_config.ninja
+++ b/obj/third_party/WebKit/Source/platform/blink_platform_unittests_apk__build_config.ninja
@@ -1,4 +1,4 @@
 rule __third_party_WebKit_Source_platform_blink_platform_unittests_apk__build_config___build_toolchain_android_arm__rule
   command = python ../../build/android/gyp/write_build_config.py --type android_apk --depfile gen/third_party/WebKit/Source/platform/blink_platform_unittests_apk__build_config.d --possible-deps-configs=\[\"gen/third_party/WebKit/Source/platform/blink_common.build_config\",\$ \"gen/third_party/WebKit/Source/platform/platform.build_config\",\$ \"gen/third_party/WebKit/Source/platform/test_support.build_config\",\$ \"gen/base/base.build_config\",\$
-\"gen/base/allocator/allocator.build_config\",\$
  \"gen/base/test/test_support.build_config\",\$ \"gen/cc/cc.build_config\",\$ \"gen/cc/test_support.build_config\",\$ \"gen/cc/blink/blink.build_config\",\$ \"gen/skia/skia.build_config\",\$ \"gen/testing/gmock/gmock.build_config\",\$ \"gen/testing/gtest/gtest.build_config\",\$ \"gen/third_party/WebKit/Source/wtf/wtf.build_config\",\$ \"gen/third_party/WebKit/Source/wtf/test_support.build_config\",\$ \"gen/third_party/harfbuzz-ng/harfbuzz-ng.build_config\",\$ \"gen/ui/gfx/gfx.build_config\",\$ \"gen/ui/gfx/geometry/geometry.build_config\",\$ \"gen/url/url.build_config\",\$ \"gen/third_party/WebKit/Source/platform/_blink_platform_unittests__library.build_config\",\$ \"gen/base/base_java.build_config\",\$ \"gen/testing/android/appurify_support/appurify_support_java.build_config\",\$ \"gen/testing/android/reporter/reporter_java.build_config\"\] --build-config gen/third_party/WebKit/Source/platform/blink_platform_unittests_apk.build_config --jar-path gen/third_party/WebKit/Source/platform/blink_platform_unittests_apk/blink_platform_unittests_apk.jar --dex-path gen/third_party/WebKit/Source/platform/blink_platform_unittests_apk/classes.dex --supports-android --requires-android --resources-zip gen/third_party/WebKit/Source/platform/blink_platform_unittests_apk/blink_platform_unittests_apk.resources.zip --android-manifest ../../testing/android/native_test/java/AndroidManifest.xml --native-libs=\[\"lib_blink_platform_unittests__library.so\"\] --readelf-path=../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-readelf --apk-path=blink_platform_unittests_apk/blink_platform_unittests-debug.apk
   description = ACTION //third_party/WebKit/Source/platform:blink_platform_unittests_apk__build_config(//build/toolchain/android:arm)
   restat = 1
@@ -21,5 +21,4 @@ build obj/third_party/WebKit/Source/platform/blink_platform_unittests_apk__build
   clang_x86/obj/v8/js2c_extras.stamp
   lib_blink_platform_unittests__library.so
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/third_party/WebKit/Source/platform/blink_platform_unittests_apk__create__package.ninja b/obj/third_party/WebKit/Source/platform/blink_platform_unittests_apk__create__package.ninja
index 991eb42..c30ed4f 100644
--- a/obj/third_party/WebKit/Source/platform/blink_platform_unittests_apk__create__package.ninja
+++ b/obj/third_party/WebKit/Source/platform/blink_platform_unittests_apk__create__package.ninja
@@ -23,5 +23,4 @@ build obj/third_party/WebKit/Source/platform/blink_platform_unittests_apk__creat
   gen/third_party/WebKit/Source/platform/blink_platform_unittests_apk/blink_platform_unittests_apk.apk_intermediates.ap_
   gen/third_party/WebKit/Source/platform/blink_platform_unittests_apk/classes.dex
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/third_party/WebKit/Source/platform/blink_platform_unittests_apk__create__package_resources.ninja b/obj/third_party/WebKit/Source/platform/blink_platform_unittests_apk__create__package_resources.ninja
index 1f1f19a..1c6341c 100644
--- a/obj/third_party/WebKit/Source/platform/blink_platform_unittests_apk__create__package_resources.ninja
+++ b/obj/third_party/WebKit/Source/platform/blink_platform_unittests_apk__create__package_resources.ninja
@@ -21,5 +21,4 @@ build obj/third_party/WebKit/Source/platform/blink_platform_unittests_apk__creat
   clang_x86/obj/v8/js2c_extras.stamp
   gen/third_party/WebKit/Source/platform/blink_platform_unittests_apk/blink_platform_unittests_apk.resources.all.zip
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/third_party/WebKit/Source/platform/blink_platform_unittests_apk__create_incremental__package.ninja b/obj/third_party/WebKit/Source/platform/blink_platform_unittests_apk__create_incremental__package.ninja
index 85f3987..ab2d38a 100644
--- a/obj/third_party/WebKit/Source/platform/blink_platform_unittests_apk__create_incremental__package.ninja
+++ b/obj/third_party/WebKit/Source/platform/blink_platform_unittests_apk__create_incremental__package.ninja
@@ -23,5 +23,4 @@ build obj/third_party/WebKit/Source/platform/blink_platform_unittests_apk__creat
   gen/third_party/WebKit/Source/platform/blink_platform_unittests_apk.build_config
   gen/third_party/WebKit/Source/platform/blink_platform_unittests_apk/blink_platform_unittests_apk.apk_intermediates_incremental.ap_
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/third_party/WebKit/Source/platform/blink_platform_unittests_apk__create_incremental__package_resources.ninja b/obj/third_party/WebKit/Source/platform/blink_platform_unittests_apk__create_incremental__package_resources.ninja
index f1875fa..6b80456 100644
--- a/obj/third_party/WebKit/Source/platform/blink_platform_unittests_apk__create_incremental__package_resources.ninja
+++ b/obj/third_party/WebKit/Source/platform/blink_platform_unittests_apk__create_incremental__package_resources.ninja
@@ -21,5 +21,4 @@ build obj/third_party/WebKit/Source/platform/blink_platform_unittests_apk__creat
   gen/third_party/WebKit/Source/platform/blink_platform_unittests_apk/blink_platform_unittests_apk.resources.all.zip
   gen/third_party/WebKit/Source/platform/blink_platform_unittests_apk__create_incremental_generate_manifest/AndroidManifest.xml
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/third_party/WebKit/Source/platform/blink_platform_unittests_apk__create_incremental_generate_manifest.ninja b/obj/third_party/WebKit/Source/platform/blink_platform_unittests_apk__create_incremental_generate_manifest.ninja
index c6e15a3..ea6cf80 100644
--- a/obj/third_party/WebKit/Source/platform/blink_platform_unittests_apk__create_incremental_generate_manifest.ninja
+++ b/obj/third_party/WebKit/Source/platform/blink_platform_unittests_apk__create_incremental_generate_manifest.ninja
@@ -20,5 +20,4 @@ build obj/third_party/WebKit/Source/platform/blink_platform_unittests_apk__creat
   clang_x86/obj/v8/js2c_experimental_extras.stamp
   clang_x86/obj/v8/js2c_extras.stamp
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/third_party/WebKit/Source/platform/blink_platform_unittests_apk__java__compile_java__javac.ninja b/obj/third_party/WebKit/Source/platform/blink_platform_unittests_apk__java__compile_java__javac.ninja
index bc70e9c..a13929c 100644
--- a/obj/third_party/WebKit/Source/platform/blink_platform_unittests_apk__java__compile_java__javac.ninja
+++ b/obj/third_party/WebKit/Source/platform/blink_platform_unittests_apk__java__compile_java__javac.ninja
@@ -28,5 +28,4 @@ build obj/third_party/WebKit/Source/platform/blink_platform_unittests_apk__java_
   gen/third_party/WebKit/Source/platform/blink_platform_unittests_apk__process_resources.srcjar
   lib.java/android.interface.jar
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/third_party/WebKit/Source/platform/blink_platform_unittests_apk__java__lint.ninja b/obj/third_party/WebKit/Source/platform/blink_platform_unittests_apk__java__lint.ninja
index 46c6b9a..ec80cca 100644
--- a/obj/third_party/WebKit/Source/platform/blink_platform_unittests_apk__java__lint.ninja
+++ b/obj/third_party/WebKit/Source/platform/blink_platform_unittests_apk__java__lint.ninja
@@ -25,5 +25,4 @@ build obj/third_party/WebKit/Source/platform/blink_platform_unittests_apk__java_
   clang_x86/obj/v8/js2c_extras.stamp
   gen/third_party/WebKit/Source/platform/blink_platform_unittests_apk/blink_platform_unittests_apk.jar
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/third_party/WebKit/Source/platform/blink_platform_unittests_apk__process_resources.ninja b/obj/third_party/WebKit/Source/platform/blink_platform_unittests_apk__process_resources.ninja
index c538d2c..ecd7aca 100644
--- a/obj/third_party/WebKit/Source/platform/blink_platform_unittests_apk__process_resources.ninja
+++ b/obj/third_party/WebKit/Source/platform/blink_platform_unittests_apk__process_resources.ninja
@@ -22,5 +22,4 @@ build obj/third_party/WebKit/Source/platform/blink_platform_unittests_apk__proce
   clang_x86/obj/v8/js2c_extras.stamp
   gen/third_party/WebKit/Source/platform/blink_platform_unittests_apk.build_config
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/third_party/WebKit/Source/wtf/_wtf_unittests__library.ninja b/obj/third_party/WebKit/Source/wtf/_wtf_unittests__library.ninja
index 1bfd9c6..4ca7138 100644
--- a/obj/third_party/WebKit/Source/wtf/_wtf_unittests__library.ninja
+++ b/obj/third_party/WebKit/Source/wtf/_wtf_unittests__library.ninja
@@ -14,5 +14,4 @@ target_output_name = lib_wtf_unittests__library
 build ./lib_wtf_unittests__library.so ./lib_wtf_unittests__library.so.TOC ./lib.unstripped/lib_wtf_unittests__library.so:
   ../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-androideabi/4.9/libgcc.a
-  obj/base/allocator/allocator.stamp
   obj/base/base_i18n.stamp
   obj/base/i18n/base_i18n_switches.o
diff --git a/obj/third_party/WebKit/Source/wtf/wtf_unittests_apk__build_config.ninja b/obj/third_party/WebKit/Source/wtf/wtf_unittests_apk__build_config.ninja
index 29232a4..87327f8 100644
--- a/obj/third_party/WebKit/Source/wtf/wtf_unittests_apk__build_config.ninja
+++ b/obj/third_party/WebKit/Source/wtf/wtf_unittests_apk__build_config.ninja
@@ -1,4 +1,4 @@
 rule __third_party_WebKit_Source_wtf_wtf_unittests_apk__build_config___build_toolchain_android_arm__rule
   command = python ../../build/android/gyp/write_build_config.py --type android_apk --depfile gen/third_party/WebKit/Source/wtf/wtf_unittests_apk__build_config.d --possible-deps-configs=\[\"gen/third_party/WebKit/Source/wtf/test_support.build_config\",\$ \"gen/third_party/WebKit/Source/wtf/wtf.build_config\",\$ \"gen/base/base.build_config\",\$
-\"gen/base/allocator/allocator.build_config\",\$
  \"gen/base/test/test_support.build_config\",\$ \"gen/testing/gmock/gmock.build_config\",\$ \"gen/testing/gtest/gtest.build_config\",\$ \"gen/third_party/WebKit/Source/wtf/_wtf_unittests__library.build_config\",\$ \"gen/base/base_java.build_config\",\$ \"gen/testing/android/appurify_support/appurify_support_java.build_config\",\$ \"gen/testing/android/reporter/reporter_java.build_config\"\] --build-config gen/third_party/WebKit/Source/wtf/wtf_unittests_apk.build_config --jar-path gen/third_party/WebKit/Source/wtf/wtf_unittests_apk/wtf_unittests_apk.jar --dex-path gen/third_party/WebKit/Source/wtf/wtf_unittests_apk/classes.dex --supports-android --requires-android --resources-zip gen/third_party/WebKit/Source/wtf/wtf_unittests_apk/wtf_unittests_apk.resources.zip --android-manifest ../../testing/android/native_test/java/AndroidManifest.xml --native-libs=\[\"lib_wtf_unittests__library.so\"\] --readelf-path=../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-readelf --apk-path=wtf_unittests_apk/wtf_unittests-debug.apk
   description = ACTION //third_party/WebKit/Source/wtf:wtf_unittests_apk__build_config(//build/toolchain/android:arm)
   restat = 1
@@ -16,5 +16,4 @@ build obj/third_party/WebKit/Source/wtf/wtf_unittests_apk__build_config.inputdep
   ./lib_wtf_unittests__library.so.TOC
   lib_wtf_unittests__library.so
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/third_party/WebKit/Source/wtf/wtf_unittests_apk__create__package.ninja b/obj/third_party/WebKit/Source/wtf/wtf_unittests_apk__create__package.ninja
index 702cac7..c051bb2 100644
--- a/obj/third_party/WebKit/Source/wtf/wtf_unittests_apk__create__package.ninja
+++ b/obj/third_party/WebKit/Source/wtf/wtf_unittests_apk__create__package.ninja
@@ -18,5 +18,4 @@ build obj/third_party/WebKit/Source/wtf/wtf_unittests_apk__create__package.input
   gen/third_party/WebKit/Source/wtf/wtf_unittests_apk/classes.dex
   gen/third_party/WebKit/Source/wtf/wtf_unittests_apk/wtf_unittests_apk.apk_intermediates.ap_
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/third_party/WebKit/Source/wtf/wtf_unittests_apk__create__package_resources.ninja b/obj/third_party/WebKit/Source/wtf/wtf_unittests_apk__create__package_resources.ninja
index 8ef708e..7e9f45e 100644
--- a/obj/third_party/WebKit/Source/wtf/wtf_unittests_apk__create__package_resources.ninja
+++ b/obj/third_party/WebKit/Source/wtf/wtf_unittests_apk__create__package_resources.ninja
@@ -16,5 +16,4 @@ build obj/third_party/WebKit/Source/wtf/wtf_unittests_apk__create__package_resou
   ./lib_wtf_unittests__library.so.TOC
   gen/third_party/WebKit/Source/wtf/wtf_unittests_apk/wtf_unittests_apk.resources.all.zip
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/third_party/WebKit/Source/wtf/wtf_unittests_apk__create_incremental__package.ninja b/obj/third_party/WebKit/Source/wtf/wtf_unittests_apk__create_incremental__package.ninja
index 12fdf46..93781f7 100644
--- a/obj/third_party/WebKit/Source/wtf/wtf_unittests_apk__create_incremental__package.ninja
+++ b/obj/third_party/WebKit/Source/wtf/wtf_unittests_apk__create_incremental__package.ninja
@@ -18,5 +18,4 @@ build obj/third_party/WebKit/Source/wtf/wtf_unittests_apk__create_incremental__p
   gen/third_party/WebKit/Source/wtf/wtf_unittests_apk.build_config
   gen/third_party/WebKit/Source/wtf/wtf_unittests_apk/wtf_unittests_apk.apk_intermediates_incremental.ap_
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/third_party/WebKit/Source/wtf/wtf_unittests_apk__create_incremental__package_resources.ninja b/obj/third_party/WebKit/Source/wtf/wtf_unittests_apk__create_incremental__package_resources.ninja
index 09eca98..64a0d17 100644
--- a/obj/third_party/WebKit/Source/wtf/wtf_unittests_apk__create_incremental__package_resources.ninja
+++ b/obj/third_party/WebKit/Source/wtf/wtf_unittests_apk__create_incremental__package_resources.ninja
@@ -16,5 +16,4 @@ build obj/third_party/WebKit/Source/wtf/wtf_unittests_apk__create_incremental__p
   gen/third_party/WebKit/Source/wtf/wtf_unittests_apk/wtf_unittests_apk.resources.all.zip
   gen/third_party/WebKit/Source/wtf/wtf_unittests_apk__create_incremental_generate_manifest/AndroidManifest.xml
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/third_party/WebKit/Source/wtf/wtf_unittests_apk__create_incremental_generate_manifest.ninja b/obj/third_party/WebKit/Source/wtf/wtf_unittests_apk__create_incremental_generate_manifest.ninja
index 3f34a96..57dce14 100644
--- a/obj/third_party/WebKit/Source/wtf/wtf_unittests_apk__create_incremental_generate_manifest.ninja
+++ b/obj/third_party/WebKit/Source/wtf/wtf_unittests_apk__create_incremental_generate_manifest.ninja
@@ -15,5 +15,4 @@ build obj/third_party/WebKit/Source/wtf/wtf_unittests_apk__create_incremental_ge
   ../../testing/android/native_test/java/AndroidManifest.xml
   ./lib_wtf_unittests__library.so.TOC
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/third_party/WebKit/Source/wtf/wtf_unittests_apk__java__compile_java__javac.ninja b/obj/third_party/WebKit/Source/wtf/wtf_unittests_apk__java__compile_java__javac.ninja
index b63807b..82a1721 100644
--- a/obj/third_party/WebKit/Source/wtf/wtf_unittests_apk__java__compile_java__javac.ninja
+++ b/obj/third_party/WebKit/Source/wtf/wtf_unittests_apk__java__compile_java__javac.ninja
@@ -23,5 +23,4 @@ build obj/third_party/WebKit/Source/wtf/wtf_unittests_apk__java__compile_java__j
   gen/third_party/WebKit/Source/wtf/wtf_unittests_apk__process_resources.srcjar
   lib.java/android.interface.jar
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/third_party/WebKit/Source/wtf/wtf_unittests_apk__java__lint.ninja b/obj/third_party/WebKit/Source/wtf/wtf_unittests_apk__java__lint.ninja
index 1b2f0c5..58f188d 100644
--- a/obj/third_party/WebKit/Source/wtf/wtf_unittests_apk__java__lint.ninja
+++ b/obj/third_party/WebKit/Source/wtf/wtf_unittests_apk__java__lint.ninja
@@ -20,5 +20,4 @@ build obj/third_party/WebKit/Source/wtf/wtf_unittests_apk__java__lint.inputdeps.
   ./lib_wtf_unittests__library.so.TOC
   gen/third_party/WebKit/Source/wtf/wtf_unittests_apk/wtf_unittests_apk.jar
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/third_party/WebKit/Source/wtf/wtf_unittests_apk__process_resources.ninja b/obj/third_party/WebKit/Source/wtf/wtf_unittests_apk__process_resources.ninja
index f6369a9..3a205e0 100644
--- a/obj/third_party/WebKit/Source/wtf/wtf_unittests_apk__process_resources.ninja
+++ b/obj/third_party/WebKit/Source/wtf/wtf_unittests_apk__process_resources.ninja
@@ -17,5 +17,4 @@ build obj/third_party/WebKit/Source/wtf/wtf_unittests_apk__process_resources.inp
   ./lib_wtf_unittests__library.so.TOC
   gen/third_party/WebKit/Source/wtf/wtf_unittests_apk.build_config
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/ui/base/_ui_base_unittests__library.ninja b/obj/ui/base/_ui_base_unittests__library.ninja
index f52ecfc..266263d 100644
--- a/obj/ui/base/_ui_base_unittests__library.ninja
+++ b/obj/ui/base/_ui_base_unittests__library.ninja
@@ -14,5 +14,4 @@ target_output_name = lib_ui_base_unittests__library
 build ./lib_ui_base_unittests__library.so ./lib_ui_base_unittests__library.so.TOC ./lib.unstripped/lib_ui_base_unittests__library.so:
   ../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-androideabi/4.9/libgcc.a
-  obj/base/allocator/allocator.stamp
   obj/base/base_i18n.stamp
   obj/base/i18n/base_i18n_switches.o
diff --git a/obj/ui/base/ui_base_unittests_apk__build_config.ninja b/obj/ui/base/ui_base_unittests_apk__build_config.ninja
index 513e977..0f0273a 100644
--- a/obj/ui/base/ui_base_unittests_apk__build_config.ninja
+++ b/obj/ui/base/ui_base_unittests_apk__build_config.ninja
@@ -1,4 +1,4 @@
 rule __ui_base_ui_base_unittests_apk__build_config___build_toolchain_android_arm__rule
   command = python ../../build/android/gyp/write_build_config.py --type android_apk --depfile gen/ui/base/ui_base_unittests_apk__build_config.d --possible-deps-configs=\[\"gen/base/base.build_config\",\$
-\"gen/base/allocator/allocator.build_config\",\$
  \"gen/base/test/test_support.build_config\",\$ \"gen/net/net.build_config\",\$ \"gen/skia/skia.build_config\",\$ \"gen/testing/gmock/gmock.build_config\",\$ \"gen/testing/gtest/gtest.build_config\",\$ \"gen/third_party/icu/icu.build_config\",\$ \"gen/ui/base/base.build_config\",\$ \"gen/ui/base/test_support.build_config\",\$ \"gen/ui/events/events_base.build_config\",\$ \"gen/ui/events/test_support.build_config\",\$ \"gen/ui/gfx/test_support.build_config\",\$ \"gen/ui/resources/resources.build_config\",\$ \"gen/ui/resources/ui_test_pak.build_config\",\$ \"gen/ui/strings/strings.build_config\",\$ \"gen/url/url.build_config\",\$ \"gen/ui/base/ime/ime.build_config\",\$ \"gen/chrome/resources.build_config\",\$ \"gen/ui/android/ui_java.build_config\",\$ \"gen/ui/base/_ui_base_unittests__library.build_config\",\$ \"gen/base/base_java.build_config\",\$ \"gen/testing/android/appurify_support/appurify_support_java.build_config\",\$ \"gen/testing/android/reporter/reporter_java.build_config\"\] --build-config gen/ui/base/ui_base_unittests_apk.build_config --jar-path gen/ui/base/ui_base_unittests_apk/ui_base_unittests_apk.jar --dex-path gen/ui/base/ui_base_unittests_apk/classes.dex --supports-android --requires-android --resources-zip gen/ui/base/ui_base_unittests_apk/ui_base_unittests_apk.resources.zip --android-manifest ../../testing/android/native_test/java/AndroidManifest.xml --native-libs=\[\"lib_ui_base_unittests__library.so\"\] --readelf-path=../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-readelf --apk-path=ui_base_unittests_apk/ui_base_unittests-debug.apk
   description = ACTION //ui/base:ui_base_unittests_apk__build_config(//build/toolchain/android:arm)
   restat = 1
@@ -16,5 +16,4 @@ build obj/ui/base/ui_base_unittests_apk__build_config.inputdeps.stamp:
   ./lib_ui_base_unittests__library.so.TOC
   lib_ui_base_unittests__library.so
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/ui/base/ui_base_unittests_apk__create__package.ninja b/obj/ui/base/ui_base_unittests_apk__create__package.ninja
index ff69fbe..d15e856 100644
--- a/obj/ui/base/ui_base_unittests_apk__create__package.ninja
+++ b/obj/ui/base/ui_base_unittests_apk__create__package.ninja
@@ -18,5 +18,4 @@ build obj/ui/base/ui_base_unittests_apk__create__package.inputdeps.stamp:
   gen/ui/base/ui_base_unittests_apk/classes.dex
   gen/ui/base/ui_base_unittests_apk/ui_base_unittests_apk.apk_intermediates.ap_
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/ui/base/ui_base_unittests_apk__create__package_resources.ninja b/obj/ui/base/ui_base_unittests_apk__create__package_resources.ninja
index 9c9a642..d0870bb 100644
--- a/obj/ui/base/ui_base_unittests_apk__create__package_resources.ninja
+++ b/obj/ui/base/ui_base_unittests_apk__create__package_resources.ninja
@@ -16,5 +16,4 @@ build obj/ui/base/ui_base_unittests_apk__create__package_resources.inputdeps.sta
   ./lib_ui_base_unittests__library.so.TOC
   gen/ui/base/ui_base_unittests_apk/ui_base_unittests_apk.resources.all.zip
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/ui/base/ui_base_unittests_apk__create_incremental__package.ninja b/obj/ui/base/ui_base_unittests_apk__create_incremental__package.ninja
index c77f0ae..95d870d 100644
--- a/obj/ui/base/ui_base_unittests_apk__create_incremental__package.ninja
+++ b/obj/ui/base/ui_base_unittests_apk__create_incremental__package.ninja
@@ -18,5 +18,4 @@ build obj/ui/base/ui_base_unittests_apk__create_incremental__package.inputdeps.s
   gen/ui/base/ui_base_unittests_apk.build_config
   gen/ui/base/ui_base_unittests_apk/ui_base_unittests_apk.apk_intermediates_incremental.ap_
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/ui/base/ui_base_unittests_apk__create_incremental__package_resources.ninja b/obj/ui/base/ui_base_unittests_apk__create_incremental__package_resources.ninja
index 135224f..23e59f3 100644
--- a/obj/ui/base/ui_base_unittests_apk__create_incremental__package_resources.ninja
+++ b/obj/ui/base/ui_base_unittests_apk__create_incremental__package_resources.ninja
@@ -16,5 +16,4 @@ build obj/ui/base/ui_base_unittests_apk__create_incremental__package_resources.i
   gen/ui/base/ui_base_unittests_apk/ui_base_unittests_apk.resources.all.zip
   gen/ui/base/ui_base_unittests_apk__create_incremental_generate_manifest/AndroidManifest.xml
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/ui/base/ui_base_unittests_apk__create_incremental_generate_manifest.ninja b/obj/ui/base/ui_base_unittests_apk__create_incremental_generate_manifest.ninja
index 90d55fc..5e11891 100644
--- a/obj/ui/base/ui_base_unittests_apk__create_incremental_generate_manifest.ninja
+++ b/obj/ui/base/ui_base_unittests_apk__create_incremental_generate_manifest.ninja
@@ -15,5 +15,4 @@ build obj/ui/base/ui_base_unittests_apk__create_incremental_generate_manifest.in
   ../../testing/android/native_test/java/AndroidManifest.xml
   ./lib_ui_base_unittests__library.so.TOC
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/ui/base/ui_base_unittests_apk__java__compile_java__javac.ninja b/obj/ui/base/ui_base_unittests_apk__java__compile_java__javac.ninja
index eac9728..591588d 100644
--- a/obj/ui/base/ui_base_unittests_apk__java__compile_java__javac.ninja
+++ b/obj/ui/base/ui_base_unittests_apk__java__compile_java__javac.ninja
@@ -23,5 +23,4 @@ build obj/ui/base/ui_base_unittests_apk__java__compile_java__javac.inputdeps.sta
   gen/ui/base/ui_base_unittests_apk__process_resources.srcjar
   lib.java/android.interface.jar
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/ui/base/ui_base_unittests_apk__java__lint.ninja b/obj/ui/base/ui_base_unittests_apk__java__lint.ninja
index 1816b53..149d3b3 100644
--- a/obj/ui/base/ui_base_unittests_apk__java__lint.ninja
+++ b/obj/ui/base/ui_base_unittests_apk__java__lint.ninja
@@ -20,5 +20,4 @@ build obj/ui/base/ui_base_unittests_apk__java__lint.inputdeps.stamp:
   ./lib_ui_base_unittests__library.so.TOC
   gen/ui/base/ui_base_unittests_apk/ui_base_unittests_apk.jar
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/ui/base/ui_base_unittests_apk__process_resources.ninja b/obj/ui/base/ui_base_unittests_apk__process_resources.ninja
index 414bdb5..3c11340 100644
--- a/obj/ui/base/ui_base_unittests_apk__process_resources.ninja
+++ b/obj/ui/base/ui_base_unittests_apk__process_resources.ninja
@@ -17,5 +17,4 @@ build obj/ui/base/ui_base_unittests_apk__process_resources.inputdeps.stamp:
   ./lib_ui_base_unittests__library.so.TOC
   gen/ui/base/ui_base_unittests_apk.build_config
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/ui/compositor/_compositor_unittests__library.ninja b/obj/ui/compositor/_compositor_unittests__library.ninja
index 9f8c888..b397b48 100644
--- a/obj/ui/compositor/_compositor_unittests__library.ninja
+++ b/obj/ui/compositor/_compositor_unittests__library.ninja
@@ -14,5 +14,4 @@ target_output_name = lib_compositor_unittests__library
 build ./lib_compositor_unittests__library.so ./lib_compositor_unittests__library.so.TOC ./lib.unstripped/lib_compositor_unittests__library.so:
   ../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-androideabi/4.9/libgcc.a
-  obj/base/allocator/allocator.stamp
   obj/base/base_i18n.stamp
   obj/base/i18n/base_i18n_switches.o
diff --git a/obj/ui/compositor/compositor_unittests_apk__build_config.ninja b/obj/ui/compositor/compositor_unittests_apk__build_config.ninja
index f94e255..a9ec6b9 100644
--- a/obj/ui/compositor/compositor_unittests_apk__build_config.ninja
+++ b/obj/ui/compositor/compositor_unittests_apk__build_config.ninja
@@ -1,4 +1,4 @@
 rule __ui_compositor_compositor_unittests_apk__build_config___build_toolchain_android_arm__rule
   command = python ../../build/android/gyp/write_build_config.py --type android_apk --depfile gen/ui/compositor/compositor_unittests_apk__build_config.d --possible-deps-configs=\[\"gen/ui/compositor/compositor.build_config\",\$ \"gen/ui/compositor/test_support.build_config\",\$ \"gen/base/base.build_config\",\$
-\"gen/base/allocator/allocator.build_config\",\$
  \"gen/base/test/test_support.build_config\",\$ \"gen/cc/cc.build_config\",\$ \"gen/cc/test_support.build_config\",\$ \"gen/skia/skia.build_config\",\$ \"gen/testing/gmock/gmock.build_config\",\$ \"gen/testing/gtest/gtest.build_config\",\$ \"gen/ui/base/base.build_config\",\$ \"gen/ui/gfx/gfx.build_config\",\$ \"gen/ui/gfx/geometry/geometry.build_config\",\$ \"gen/ui/gl/gl.build_config\",\$ \"gen/ui/resources/resources.build_config\",\$ \"gen/ui/compositor/_compositor_unittests__library.build_config\",\$ \"gen/base/base_java.build_config\",\$ \"gen/testing/android/appurify_support/appurify_support_java.build_config\",\$ \"gen/testing/android/reporter/reporter_java.build_config\"\] --build-config gen/ui/compositor/compositor_unittests_apk.build_config --jar-path gen/ui/compositor/compositor_unittests_apk/compositor_unittests_apk.jar --dex-path gen/ui/compositor/compositor_unittests_apk/classes.dex --supports-android --requires-android --resources-zip gen/ui/compositor/compositor_unittests_apk/compositor_unittests_apk.resources.zip --android-manifest ../../testing/android/native_test/java/AndroidManifest.xml --native-libs=\[\"lib_compositor_unittests__library.so\"\] --readelf-path=../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-readelf --apk-path=compositor_unittests_apk/compositor_unittests-debug.apk
   description = ACTION //ui/compositor:compositor_unittests_apk__build_config(//build/toolchain/android:arm)
   restat = 1
@@ -16,5 +16,4 @@ build obj/ui/compositor/compositor_unittests_apk__build_config.inputdeps.stamp:
   ./lib_compositor_unittests__library.so.TOC
   lib_compositor_unittests__library.so
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/ui/compositor/compositor_unittests_apk__create__package.ninja b/obj/ui/compositor/compositor_unittests_apk__create__package.ninja
index f98def9..ca99f91 100644
--- a/obj/ui/compositor/compositor_unittests_apk__create__package.ninja
+++ b/obj/ui/compositor/compositor_unittests_apk__create__package.ninja
@@ -18,5 +18,4 @@ build obj/ui/compositor/compositor_unittests_apk__create__package.inputdeps.stam
   gen/ui/compositor/compositor_unittests_apk/classes.dex
   gen/ui/compositor/compositor_unittests_apk/compositor_unittests_apk.apk_intermediates.ap_
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/ui/compositor/compositor_unittests_apk__create__package_resources.ninja b/obj/ui/compositor/compositor_unittests_apk__create__package_resources.ninja
index b63a823..ee5388e 100644
--- a/obj/ui/compositor/compositor_unittests_apk__create__package_resources.ninja
+++ b/obj/ui/compositor/compositor_unittests_apk__create__package_resources.ninja
@@ -16,5 +16,4 @@ build obj/ui/compositor/compositor_unittests_apk__create__package_resources.inpu
   ./lib_compositor_unittests__library.so.TOC
   gen/ui/compositor/compositor_unittests_apk/compositor_unittests_apk.resources.all.zip
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/ui/compositor/compositor_unittests_apk__create_incremental__package.ninja b/obj/ui/compositor/compositor_unittests_apk__create_incremental__package.ninja
index e0435bd..cf8ab90 100644
--- a/obj/ui/compositor/compositor_unittests_apk__create_incremental__package.ninja
+++ b/obj/ui/compositor/compositor_unittests_apk__create_incremental__package.ninja
@@ -18,5 +18,4 @@ build obj/ui/compositor/compositor_unittests_apk__create_incremental__package.in
   gen/ui/compositor/compositor_unittests_apk.build_config
   gen/ui/compositor/compositor_unittests_apk/compositor_unittests_apk.apk_intermediates_incremental.ap_
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/ui/compositor/compositor_unittests_apk__create_incremental__package_resources.ninja b/obj/ui/compositor/compositor_unittests_apk__create_incremental__package_resources.ninja
index bf69979..9859cfd 100644
--- a/obj/ui/compositor/compositor_unittests_apk__create_incremental__package_resources.ninja
+++ b/obj/ui/compositor/compositor_unittests_apk__create_incremental__package_resources.ninja
@@ -16,5 +16,4 @@ build obj/ui/compositor/compositor_unittests_apk__create_incremental__package_re
   gen/ui/compositor/compositor_unittests_apk/compositor_unittests_apk.resources.all.zip
   gen/ui/compositor/compositor_unittests_apk__create_incremental_generate_manifest/AndroidManifest.xml
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/ui/compositor/compositor_unittests_apk__create_incremental_generate_manifest.ninja b/obj/ui/compositor/compositor_unittests_apk__create_incremental_generate_manifest.ninja
index 655ede2..2b32ce0 100644
--- a/obj/ui/compositor/compositor_unittests_apk__create_incremental_generate_manifest.ninja
+++ b/obj/ui/compositor/compositor_unittests_apk__create_incremental_generate_manifest.ninja
@@ -15,5 +15,4 @@ build obj/ui/compositor/compositor_unittests_apk__create_incremental_generate_ma
   ../../testing/android/native_test/java/AndroidManifest.xml
   ./lib_compositor_unittests__library.so.TOC
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/ui/compositor/compositor_unittests_apk__java__compile_java__javac.ninja b/obj/ui/compositor/compositor_unittests_apk__java__compile_java__javac.ninja
index 98425b4..9c846f4 100644
--- a/obj/ui/compositor/compositor_unittests_apk__java__compile_java__javac.ninja
+++ b/obj/ui/compositor/compositor_unittests_apk__java__compile_java__javac.ninja
@@ -23,5 +23,4 @@ build obj/ui/compositor/compositor_unittests_apk__java__compile_java__javac.inpu
   gen/ui/compositor/compositor_unittests_apk__process_resources.srcjar
   lib.java/android.interface.jar
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/ui/compositor/compositor_unittests_apk__java__lint.ninja b/obj/ui/compositor/compositor_unittests_apk__java__lint.ninja
index 2b9c386..884b296 100644
--- a/obj/ui/compositor/compositor_unittests_apk__java__lint.ninja
+++ b/obj/ui/compositor/compositor_unittests_apk__java__lint.ninja
@@ -20,5 +20,4 @@ build obj/ui/compositor/compositor_unittests_apk__java__lint.inputdeps.stamp:
   ./lib_compositor_unittests__library.so.TOC
   gen/ui/compositor/compositor_unittests_apk/compositor_unittests_apk.jar
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/ui/compositor/compositor_unittests_apk__process_resources.ninja b/obj/ui/compositor/compositor_unittests_apk__process_resources.ninja
index 3af3267..e4a53b7 100644
--- a/obj/ui/compositor/compositor_unittests_apk__process_resources.ninja
+++ b/obj/ui/compositor/compositor_unittests_apk__process_resources.ninja
@@ -17,5 +17,4 @@ build obj/ui/compositor/compositor_unittests_apk__process_resources.inputdeps.st
   ./lib_compositor_unittests__library.so.TOC
   gen/ui/compositor/compositor_unittests_apk.build_config
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/ui/message_center/_message_center_unittests__library.ninja b/obj/ui/message_center/_message_center_unittests__library.ninja
index fe17f23..2c10c98 100644
--- a/obj/ui/message_center/_message_center_unittests__library.ninja
+++ b/obj/ui/message_center/_message_center_unittests__library.ninja
@@ -14,5 +14,4 @@ target_output_name = lib_message_center_unittests__library
 build ./lib_message_center_unittests__library.so ./lib_message_center_unittests__library.so.TOC ./lib.unstripped/lib_message_center_unittests__library.so:
   ../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-androideabi/4.9/libgcc.a
-  obj/base/allocator/allocator.stamp
   obj/base/base_i18n.stamp
   obj/base/i18n/base_i18n_switches.o
diff --git a/obj/ui/message_center/message_center_unittests_apk__build_config.ninja b/obj/ui/message_center/message_center_unittests_apk__build_config.ninja
index c922e63..940a80a 100644
--- a/obj/ui/message_center/message_center_unittests_apk__build_config.ninja
+++ b/obj/ui/message_center/message_center_unittests_apk__build_config.ninja
@@ -1,4 +1,4 @@
 rule __ui_message_center_message_center_unittests_apk__build_config___build_toolchain_android_arm__rule
   command = python ../../build/android/gyp/write_build_config.py --type android_apk --depfile gen/ui/message_center/message_center_unittests_apk__build_config.d --possible-deps-configs=\[\"gen/ui/message_center/message_center.build_config\",\$ \"gen/ui/message_center/test_support.build_config\",\$ \"gen/base/base.build_config\",\$
-\"gen/base/allocator/allocator.build_config\",\$
  \"gen/base/test/test_support.build_config\",\$ \"gen/skia/skia.build_config\",\$ \"gen/testing/gtest/gtest.build_config\",\$ \"gen/ui/base/base.build_config\",\$ \"gen/ui/events/events.build_config\",\$ \"gen/ui/gfx/gfx.build_config\",\$ \"gen/ui/gfx/geometry/geometry.build_config\",\$ \"gen/ui/gl/gl.build_config\",\$ \"gen/ui/gl/test_support.build_config\",\$ \"gen/ui/resources/resources.build_config\",\$ \"gen/ui/resources/ui_test_pak.build_config\",\$ \"gen/url/url.build_config\",\$ \"gen/ui/message_center/_message_center_unittests__library.build_config\",\$ \"gen/base/base_java.build_config\",\$ \"gen/testing/android/appurify_support/appurify_support_java.build_config\",\$ \"gen/testing/android/reporter/reporter_java.build_config\"\] --build-config gen/ui/message_center/message_center_unittests_apk.build_config --jar-path gen/ui/message_center/message_center_unittests_apk/message_center_unittests_apk.jar --dex-path gen/ui/message_center/message_center_unittests_apk/classes.dex --supports-android --requires-android --resources-zip gen/ui/message_center/message_center_unittests_apk/message_center_unittests_apk.resources.zip --android-manifest ../../testing/android/native_test/java/AndroidManifest.xml --native-libs=\[\"lib_message_center_unittests__library.so\"\] --readelf-path=../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-readelf --apk-path=message_center_unittests_apk/message_center_unittests-debug.apk
   description = ACTION //ui/message_center:message_center_unittests_apk__build_config(//build/toolchain/android:arm)
   restat = 1
@@ -16,5 +16,4 @@ build obj/ui/message_center/message_center_unittests_apk__build_config.inputdeps
   ./lib_message_center_unittests__library.so.TOC
   lib_message_center_unittests__library.so
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/ui/message_center/message_center_unittests_apk__create__package.ninja b/obj/ui/message_center/message_center_unittests_apk__create__package.ninja
index 01b243f..8ef00c5 100644
--- a/obj/ui/message_center/message_center_unittests_apk__create__package.ninja
+++ b/obj/ui/message_center/message_center_unittests_apk__create__package.ninja
@@ -18,5 +18,4 @@ build obj/ui/message_center/message_center_unittests_apk__create__package.inputd
   gen/ui/message_center/message_center_unittests_apk/classes.dex
   gen/ui/message_center/message_center_unittests_apk/message_center_unittests_apk.apk_intermediates.ap_
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/ui/message_center/message_center_unittests_apk__create__package_resources.ninja b/obj/ui/message_center/message_center_unittests_apk__create__package_resources.ninja
index cd401fa..36f8220 100644
--- a/obj/ui/message_center/message_center_unittests_apk__create__package_resources.ninja
+++ b/obj/ui/message_center/message_center_unittests_apk__create__package_resources.ninja
@@ -16,5 +16,4 @@ build obj/ui/message_center/message_center_unittests_apk__create__package_resour
   ./lib_message_center_unittests__library.so.TOC
   gen/ui/message_center/message_center_unittests_apk/message_center_unittests_apk.resources.all.zip
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/ui/message_center/message_center_unittests_apk__create_incremental__package.ninja b/obj/ui/message_center/message_center_unittests_apk__create_incremental__package.ninja
index 4924e28..00350f7 100644
--- a/obj/ui/message_center/message_center_unittests_apk__create_incremental__package.ninja
+++ b/obj/ui/message_center/message_center_unittests_apk__create_incremental__package.ninja
@@ -18,5 +18,4 @@ build obj/ui/message_center/message_center_unittests_apk__create_incremental__pa
   gen/ui/message_center/message_center_unittests_apk.build_config
   gen/ui/message_center/message_center_unittests_apk/message_center_unittests_apk.apk_intermediates_incremental.ap_
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/ui/message_center/message_center_unittests_apk__create_incremental__package_resources.ninja b/obj/ui/message_center/message_center_unittests_apk__create_incremental__package_resources.ninja
index 7606fd3..c77dbcf 100644
--- a/obj/ui/message_center/message_center_unittests_apk__create_incremental__package_resources.ninja
+++ b/obj/ui/message_center/message_center_unittests_apk__create_incremental__package_resources.ninja
@@ -16,5 +16,4 @@ build obj/ui/message_center/message_center_unittests_apk__create_incremental__pa
   gen/ui/message_center/message_center_unittests_apk/message_center_unittests_apk.resources.all.zip
   gen/ui/message_center/message_center_unittests_apk__create_incremental_generate_manifest/AndroidManifest.xml
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/ui/message_center/message_center_unittests_apk__create_incremental_generate_manifest.ninja b/obj/ui/message_center/message_center_unittests_apk__create_incremental_generate_manifest.ninja
index e89ebbd..07cc248 100644
--- a/obj/ui/message_center/message_center_unittests_apk__create_incremental_generate_manifest.ninja
+++ b/obj/ui/message_center/message_center_unittests_apk__create_incremental_generate_manifest.ninja
@@ -15,5 +15,4 @@ build obj/ui/message_center/message_center_unittests_apk__create_incremental_gen
   ../../testing/android/native_test/java/AndroidManifest.xml
   ./lib_message_center_unittests__library.so.TOC
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/ui/message_center/message_center_unittests_apk__java__compile_java__javac.ninja b/obj/ui/message_center/message_center_unittests_apk__java__compile_java__javac.ninja
index e079449..6c2a9eb 100644
--- a/obj/ui/message_center/message_center_unittests_apk__java__compile_java__javac.ninja
+++ b/obj/ui/message_center/message_center_unittests_apk__java__compile_java__javac.ninja
@@ -23,5 +23,4 @@ build obj/ui/message_center/message_center_unittests_apk__java__compile_java__ja
   gen/ui/message_center/message_center_unittests_apk__process_resources.srcjar
   lib.java/android.interface.jar
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/ui/message_center/message_center_unittests_apk__java__lint.ninja b/obj/ui/message_center/message_center_unittests_apk__java__lint.ninja
index ef60c2d..0bb0df9 100644
--- a/obj/ui/message_center/message_center_unittests_apk__java__lint.ninja
+++ b/obj/ui/message_center/message_center_unittests_apk__java__lint.ninja
@@ -20,5 +20,4 @@ build obj/ui/message_center/message_center_unittests_apk__java__lint.inputdeps.s
   ./lib_message_center_unittests__library.so.TOC
   gen/ui/message_center/message_center_unittests_apk/message_center_unittests_apk.jar
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/ui/message_center/message_center_unittests_apk__process_resources.ninja b/obj/ui/message_center/message_center_unittests_apk__process_resources.ninja
index 2c4e3d0..41717e0 100644
--- a/obj/ui/message_center/message_center_unittests_apk__process_resources.ninja
+++ b/obj/ui/message_center/message_center_unittests_apk__process_resources.ninja
@@ -17,5 +17,4 @@ build obj/ui/message_center/message_center_unittests_apk__process_resources.inpu
   ./lib_message_center_unittests__library.so.TOC
   gen/ui/message_center/message_center_unittests_apk.build_config
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/ui/snapshot/_snapshot_unittests__library.ninja b/obj/ui/snapshot/_snapshot_unittests__library.ninja
index 0e8b0ce..d6c8045 100644
--- a/obj/ui/snapshot/_snapshot_unittests__library.ninja
+++ b/obj/ui/snapshot/_snapshot_unittests__library.ninja
@@ -14,5 +14,4 @@ target_output_name = lib_snapshot_unittests__library
 build ./lib_snapshot_unittests__library.so ./lib_snapshot_unittests__library.so.TOC ./lib.unstripped/lib_snapshot_unittests__library.so:
   ../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-androideabi/4.9/libgcc.a
-  obj/base/allocator/allocator.stamp
   obj/base/base_i18n.stamp
   obj/base/i18n/base_i18n_switches.o
diff --git a/obj/ui/snapshot/snapshot_unittests_apk__build_config.ninja b/obj/ui/snapshot/snapshot_unittests_apk__build_config.ninja
index cefdf81..a9705e1 100644
--- a/obj/ui/snapshot/snapshot_unittests_apk__build_config.ninja
+++ b/obj/ui/snapshot/snapshot_unittests_apk__build_config.ninja
@@ -1,4 +1,4 @@
 rule __ui_snapshot_snapshot_unittests_apk__build_config___build_toolchain_android_arm__rule
   command = python ../../build/android/gyp/write_build_config.py --type android_apk --depfile gen/ui/snapshot/snapshot_unittests_apk__build_config.d --possible-deps-configs=\[\"gen/ui/snapshot/snapshot.build_config\",\$ \"gen/base/base.build_config\",\$
-\"gen/base/allocator/allocator.build_config\",\$
  \"gen/base/test/test_support.build_config\",\$ \"gen/skia/skia.build_config\",\$ \"gen/testing/gtest/gtest.build_config\",\$ \"gen/ui/base/base.build_config\",\$ \"gen/ui/compositor/test_support.build_config\",\$ \"gen/ui/gfx/gfx.build_config\",\$ \"gen/ui/gfx/geometry/geometry.build_config\",\$ \"gen/ui/gl/gl.build_config\",\$ \"gen/ui/snapshot/_snapshot_unittests__library.build_config\",\$ \"gen/base/base_java.build_config\",\$ \"gen/testing/android/appurify_support/appurify_support_java.build_config\",\$ \"gen/testing/android/reporter/reporter_java.build_config\"\] --build-config gen/ui/snapshot/snapshot_unittests_apk.build_config --jar-path gen/ui/snapshot/snapshot_unittests_apk/snapshot_unittests_apk.jar --dex-path gen/ui/snapshot/snapshot_unittests_apk/classes.dex --supports-android --requires-android --resources-zip gen/ui/snapshot/snapshot_unittests_apk/snapshot_unittests_apk.resources.zip --android-manifest ../../testing/android/native_test/java/AndroidManifest.xml --native-libs=\[\"lib_snapshot_unittests__library.so\"\] --readelf-path=../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-readelf --apk-path=snapshot_unittests_apk/snapshot_unittests-debug.apk
   description = ACTION //ui/snapshot:snapshot_unittests_apk__build_config(//build/toolchain/android:arm)
   restat = 1
@@ -16,5 +16,4 @@ build obj/ui/snapshot/snapshot_unittests_apk__build_config.inputdeps.stamp:
   ./lib_snapshot_unittests__library.so.TOC
   lib_snapshot_unittests__library.so
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/ui/snapshot/snapshot_unittests_apk__create__package.ninja b/obj/ui/snapshot/snapshot_unittests_apk__create__package.ninja
index 17e2ec1..5c46e6d 100644
--- a/obj/ui/snapshot/snapshot_unittests_apk__create__package.ninja
+++ b/obj/ui/snapshot/snapshot_unittests_apk__create__package.ninja
@@ -18,5 +18,4 @@ build obj/ui/snapshot/snapshot_unittests_apk__create__package.inputdeps.stamp:
   gen/ui/snapshot/snapshot_unittests_apk/classes.dex
   gen/ui/snapshot/snapshot_unittests_apk/snapshot_unittests_apk.apk_intermediates.ap_
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/ui/snapshot/snapshot_unittests_apk__create__package_resources.ninja b/obj/ui/snapshot/snapshot_unittests_apk__create__package_resources.ninja
index 05f6c15..01c7674 100644
--- a/obj/ui/snapshot/snapshot_unittests_apk__create__package_resources.ninja
+++ b/obj/ui/snapshot/snapshot_unittests_apk__create__package_resources.ninja
@@ -16,5 +16,4 @@ build obj/ui/snapshot/snapshot_unittests_apk__create__package_resources.inputdep
   ./lib_snapshot_unittests__library.so.TOC
   gen/ui/snapshot/snapshot_unittests_apk/snapshot_unittests_apk.resources.all.zip
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/ui/snapshot/snapshot_unittests_apk__create_incremental__package.ninja b/obj/ui/snapshot/snapshot_unittests_apk__create_incremental__package.ninja
index a747a90..b4fc4e3 100644
--- a/obj/ui/snapshot/snapshot_unittests_apk__create_incremental__package.ninja
+++ b/obj/ui/snapshot/snapshot_unittests_apk__create_incremental__package.ninja
@@ -18,5 +18,4 @@ build obj/ui/snapshot/snapshot_unittests_apk__create_incremental__package.inputd
   gen/ui/snapshot/snapshot_unittests_apk.build_config
   gen/ui/snapshot/snapshot_unittests_apk/snapshot_unittests_apk.apk_intermediates_incremental.ap_
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/ui/snapshot/snapshot_unittests_apk__create_incremental__package_resources.ninja b/obj/ui/snapshot/snapshot_unittests_apk__create_incremental__package_resources.ninja
index eafb1e8..d0881c0 100644
--- a/obj/ui/snapshot/snapshot_unittests_apk__create_incremental__package_resources.ninja
+++ b/obj/ui/snapshot/snapshot_unittests_apk__create_incremental__package_resources.ninja
@@ -16,5 +16,4 @@ build obj/ui/snapshot/snapshot_unittests_apk__create_incremental__package_resour
   gen/ui/snapshot/snapshot_unittests_apk/snapshot_unittests_apk.resources.all.zip
   gen/ui/snapshot/snapshot_unittests_apk__create_incremental_generate_manifest/AndroidManifest.xml
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/ui/snapshot/snapshot_unittests_apk__create_incremental_generate_manifest.ninja b/obj/ui/snapshot/snapshot_unittests_apk__create_incremental_generate_manifest.ninja
index 58f70af..2539371 100644
--- a/obj/ui/snapshot/snapshot_unittests_apk__create_incremental_generate_manifest.ninja
+++ b/obj/ui/snapshot/snapshot_unittests_apk__create_incremental_generate_manifest.ninja
@@ -15,5 +15,4 @@ build obj/ui/snapshot/snapshot_unittests_apk__create_incremental_generate_manife
   ../../testing/android/native_test/java/AndroidManifest.xml
   ./lib_snapshot_unittests__library.so.TOC
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/ui/snapshot/snapshot_unittests_apk__java__compile_java__javac.ninja b/obj/ui/snapshot/snapshot_unittests_apk__java__compile_java__javac.ninja
index e315580..771d3d4 100644
--- a/obj/ui/snapshot/snapshot_unittests_apk__java__compile_java__javac.ninja
+++ b/obj/ui/snapshot/snapshot_unittests_apk__java__compile_java__javac.ninja
@@ -23,5 +23,4 @@ build obj/ui/snapshot/snapshot_unittests_apk__java__compile_java__javac.inputdep
   gen/ui/snapshot/snapshot_unittests_apk__process_resources.srcjar
   lib.java/android.interface.jar
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/ui/snapshot/snapshot_unittests_apk__java__lint.ninja b/obj/ui/snapshot/snapshot_unittests_apk__java__lint.ninja
index 94167a5..c90bdac 100644
--- a/obj/ui/snapshot/snapshot_unittests_apk__java__lint.ninja
+++ b/obj/ui/snapshot/snapshot_unittests_apk__java__lint.ninja
@@ -20,5 +20,4 @@ build obj/ui/snapshot/snapshot_unittests_apk__java__lint.inputdeps.stamp:
   ./lib_snapshot_unittests__library.so.TOC
   gen/ui/snapshot/snapshot_unittests_apk/snapshot_unittests_apk.jar
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp
diff --git a/obj/ui/snapshot/snapshot_unittests_apk__process_resources.ninja b/obj/ui/snapshot/snapshot_unittests_apk__process_resources.ninja
index 773aac4..d030cfe 100644
--- a/obj/ui/snapshot/snapshot_unittests_apk__process_resources.ninja
+++ b/obj/ui/snapshot/snapshot_unittests_apk__process_resources.ninja
@@ -17,5 +17,4 @@ build obj/ui/snapshot/snapshot_unittests_apk__process_resources.inputdeps.stamp:
   ./lib_snapshot_unittests__library.so.TOC
   gen/ui/snapshot/snapshot_unittests_apk.build_config
-  obj/base/allocator/allocator.stamp
   obj/base/android_runtime_jni_headers__jni_Runtime.stamp
   obj/base/base_android_java_enums_srcjar.stamp