Revert r169382 now that android:40302 is fixed.

build/common.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.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
@@ skipping 3897 matching lines @@
                       '<(android_ndk_lib)/crtbegin_so.o',
                     ],
                     'libraries': [
                       # crtend_so.o needs to be the last item in libraries.
                       # Do not add any libraries after this!
                       '<(android_ndk_lib)/crtend_so.o',
                     ],
                   }],
                 ],
               }],
-              # 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.
           ['_toolset=="host"', {
             'cflags!': [
               # Due to issues in Clang build system, using ASan on 32-bit
               # binaries on x86_64 host is problematic.
               # TODO(eugenis): re-enable.
               '-fsanitize=address',
               '-w',  # http://crbug.com/162783
@@ skipping 847 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }