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

BUG=None
TEST=Build Chrome for arm and x86 Android, all static libraries are copied to out directory

Review URL: https://chromiumcodereview.appspot.com/14993005

git-svn-id: http://src.chromium.org/svn/trunk/src/build@199267 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

common.gypi

@@ -2988,16 +2988,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,
-                      }],
-                    ],
                   }],
                 ],
               }],
@@ -3628,6 +3618,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.