[counting_allocator] Chrome changes.

build/config/android/BUILD.gn

Index: build/config/android/BUILD.gn
diff --git a/build/config/android/BUILD.gn b/build/config/android/BUILD.gn
index fddca1be0b3cc771957fdc8908052f17dba734fe..359a5a469ed839df382c8701fd36f4d6bc2176b7 100644
--- a/build/config/android/BUILD.gn
+++ b/build/config/android/BUILD.gn
@@ -123,21 +123,25 @@ config("runtime_library") {
 
   defines = [ "__GNU_SOURCE=1" ]  # Necessary for clone().
   ldflags = [ "-nostdlib" ]
+
   lib_dirs = [ android_libcpp_lib_dir ]
 
-  # The libc++ runtime library (must come first).
-  # ASan needs to dynamically link to libc++ even in static builds so
-  # that it can interpose operator new.
-  if (is_component_build || is_asan) {
-    libs = [ "c++_shared" ]
-  } else {
-    libs = [ "c++_static" ]
-  }
-  libs += [
+  libs = [
     "c++abi",
     "android_support",
   ]
 
+  if (false) {
+    # The libc++ runtime library (must come first).
+    # ASan needs to dynamically link to libc++ even in static builds so
+    # that it can interpose operator new.
+    if (is_component_build || is_asan) {
+      libs += [ "c++_shared" ]
+    } else {
+      libs += [ "c++_static" ]
+    }
+  }
+
   # arm builds of libc++ starting in NDK r12 depend on unwind.
   if (current_cpu == "arm") {
     libs += [ "unwind" ]