Fix static libraries will not be copied to product out directory issue on x86 Android

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 915d173fc3e2fb9c2e116ef8f712abed045d94eb..9e40a8ff30ed456a600d127db1c29ab48069d849 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -2980,16 +2980,6 @@
                         ],
                       }],
                     ],
-                    'target_conditions': [
-                      # ndk-build copies .a's around the filesystem, breaking
-                      # relative paths in thin archives.  Disable using thin
-                      # archives to avoid problems until one of these is fixed:
-                      # http://code.google.com/p/android/issues/detail?id=40302
-                      # http://code.google.com/p/android/issues/detail?id=40303
-                      ['_type=="static_library"', {
-                        'standalone_static_library': 1,
-                      }],
-                    ],
                   }],
                 ],
               }],
@@ -3620,6 +3610,14 @@
                   }],
                 ],
               }],
+              # ndk-build copies .a's around the filesystem, breaking
+              # relative paths in thin archives.  Disable using thin
+              # archives to avoid problems until one of these is fixed:
+              # http://code.google.com/p/android/issues/detail?id=40302
+              # http://code.google.com/p/android/issues/detail?id=40303
+              ['_type=="static_library"', {
+                'standalone_static_library': 1,
+              }],
             ],
           }],
           # Settings for building host targets using the system toolchain.