Reapply "Changes according to review comments"

base/base.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.
 
 {
   'target_defaults': {
     'variables': {
       'base_target': 0,
     },
     'target_conditions': [
@@ skipping 21 matching lines @@
           'android/jni_android.cc',
           'android/jni_android.h',
           'android/jni_array.cc',
           'android/jni_array.h',
           'android/jni_helper.cc',
           'android/jni_helper.h',
           'android/jni_registrar.cc',
           'android/jni_registrar.h',
           'android/jni_string.cc',
           'android/jni_string.h',
+          'android/locale_utils.cc',
+          'android/locale_utils.h',
           'android/path_utils.cc',
           'android/path_utils.h',
           'at_exit.cc',
           'at_exit.h',
           'atomic_ref_count.h',
           'atomic_sequence_num.h',
           'atomicops.h',
           'atomicops_internals_x86_gcc.cc',
           'atomicops_internals_x86_gcc.h',
           'atomicops_internals_x86_msvc.h',
@@ skipping 637 matching lines @@
           'conditions': [
             ['target_arch == "ia32"', {
               'sources/': [
                 ['include', '^atomicops_internals_x86_gcc\\.cc$'],
               ],
             }],
           ],
           'dependencies': [
             'symbolize',
             '../third_party/ashmem/ashmem.gyp:ashmem',
+            '../third_party/icu/icu.gyp:icuuc',
             'base_java',
             'base_jni_headers',
           ],
           'include_dirs': [
             '<(SHARED_INTERMEDIATE_DIR)/base',
           ],
           'link_settings': {
             'libraries': [
               '-llog',
             ],
@@ skipping 226 matching lines @@
             'third_party/xdg_mime/xdgmimemagic.c',
             'third_party/xdg_mime/xdgmimemagic.h',
             'third_party/xdg_mime/xdgmimeparent.c',
             'third_party/xdg_mime/xdgmimeparent.h',
           ],
         },
       ],
     }],
   ],
 }