Fix conflict resolution in favor of the upstream side.

content/content_shell.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'content_shell_product_name': 'Content Shell',
     # The "19" is so that sites that sniff for version think that this is
     # something reasonably current; the "77.34.5" is a hint that this isn't a
     # standard Chrome.
@@ skipping 1015 matching lines @@
             'native_lib_target': 'libcontent_shell_content_view',
             'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/content_shell.pak'],
             'asset_location': '<(PRODUCT_DIR)/content_shell/assets',
             'extra_native_libs': ['<(SHARED_LIB_DIR)/libosmesa.so'],
             'conditions': [
               ['icu_use_data_file_flag==1', {
                 'additional_input_paths': [
                   '<(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': [
             ['android_webview_build==0', {
               'dependencies': [
                 '../tools/imagediff/image_diff.gyp:image_diff#host',
               ],
             }],
             ['enable_dart_native_extensions==1', {
               'dependencies': [
@@ skipping 56 matching lines @@
                 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb',
                 '--destination_dir', '<(dest_dir)',
               ],
             },
           ],
         },
       ],
     }],  # OS=="win" and fastbuild==0 and target_arch=="ia32"
   ]
 }