Fix build issues in base/ for Android x64

base/base.gyp

 # 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': {
     'chromium_code': 1,
   },
   'includes': [
     '../build/win_precompile.gypi',
@@ skipping 110 matching lines @@
                 ['exclude', '^process_util_linux\\.cc$'],
                 ['exclude', '^sys_info_linux\\.cc$'],
                 ['exclude', '^sys_string_conversions_linux\\.cc$'],
                 ['exclude', '^worker_pool_linux\\.cc$'],
               ],
             }],
           ],
         }],
         ['OS == "android" and _toolset == "target"', {
           'conditions': [
-            ['target_arch == "ia32"', {
+            ['target_arch == "ia32" or target_arch == "x64"', {
               'sources/': [
                 ['include', '^atomicops_internals_x86_gcc\\.cc$'],
               ],
             }],
             ['target_arch == "mipsel"', {
               'sources/': [
                 ['include', '^atomicops_internals_mips_gcc\\.cc$'],
               ],
             }],
           ],
@@ skipping 1300 matching lines @@
             'base_unittests.isolate',
           ],
           'sources': [
             'base_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }