Android WebView: tidy up library dependencies.

build/android/cpufeatures.gypi

Index: build/android/cpufeatures.gypi
diff --git a/build/android/cpufeatures.gypi b/build/android/cpufeatures.gypi
index 96de2824df54d80c32908b312e8745d874eb4f8a..c08e95641a8ff1a75ecb6489f538dde78be7ac96 100644
--- a/build/android/cpufeatures.gypi
+++ b/build/android/cpufeatures.gypi
@@ -8,9 +8,20 @@
 {
   'conditions': [
     ['android_webview_build == 1', {
+      # This is specified twice intentionally: Android provides include paths
+      # to targets automatically if they depend on libraries, so we add this
+      # library to every target that includes this .gypi to make the headers
+      # available, then also add it to targets that link those targets via
+      # link_settings to ensure it ends up being linked even if the main target
+      # doesn't include this .gypi.
       'libraries': [
-        'cpufeatures.a'
+        'cpufeatures.a',
       ],
+      'link_settings': {
+        'libraries': [
+          'cpufeatures.a',
+        ],
+      },
     }, {
       'dependencies': [
         '<(android_ndk_root)/android_tools_ndk.gyp:cpu_features',