Fix conflict resolution in favor of the upstream side.

content/content_shell.gypi

Index: content/content_shell.gypi
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 3735cd817d3ac43c5d3a14facb75028fe53b4f00..cd6f6c48f704623597fefacb37be0f61785d03b1 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -1033,14 +1033,6 @@
                   '<(PRODUCT_DIR)/icudtl.dat',
                 ],
               }],
-              ['component != "shared_library" and target_arch != "arm64" and target_arch != "x64" and enable_dart_native_extensions != 1', {
-                # Only enable the chromium linker on regular builds, since the
-                # component build crashes on Android 4.4. See b/11379966
-
-                # Disable when using dart native extensions, so the extensions
-                # do not get sent through the crazy linker.
-                'use_chromium_linker': '1',
-              }],
             ],
           },
           'conditions': [