Reapply "Changes according to review comments"

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 520 matching lines @@
   ],
   'conditions': [
     ['OS == "android"', {
       'targets': [
         {
           'target_name': 'base_jni_headers',
           'type': 'none',
           'variables': {
             'java_sources': [
               'android/java/org/chromium/base/BuildInfo.java',
+              'android/java/org/chromium/base/LocaleUtils.java',
               'android/java/org/chromium/base/PathUtils.java',
               'android/java/org/chromium/base/SystemMessageHandler.java',
             ],
             'jni_headers': [
               '<(SHARED_INTERMEDIATE_DIR)/base/jni/build_info_jni.h',
+              '<(SHARED_INTERMEDIATE_DIR)/base/jni/locale_utils_jni.h',
               '<(SHARED_INTERMEDIATE_DIR)/base/jni/path_utils_jni.h',
               '<(SHARED_INTERMEDIATE_DIR)/base/jni/system_message_handler_jni.h',
             ],
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
           'target_name': 'base_java',
           'type': 'none',
           'variables': {
@@ skipping 127 matching lines @@
                 '--ant-args', 
                 '-DPRODUCT_DIR=<(PRODUCT_DIR)',
                 '--ant-compile'
               ],
             },
           ]
         }],
     }],
   ],
 }