Roll ICU and convert include style to standard Chromium style,

base/android/locale_utils.cc

 // 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.
 
 #include "base/android/locale_utils.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "jni/LocaleUtils_jni.h"
-#include "unicode/uloc.h"
+#include "third_party/icu/public/common/unicode/uloc.h"
 
 namespace base {
 namespace android {
 
 std::string GetDefaultLocale() {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jstring> locale = Java_LocaleUtils_getDefaultLocale(env);
   return ConvertJavaStringToUTF8(locale);
 }
 
@@ skipping 62 matching lines @@
                                                  java_display_locale.obj())));
   return ConvertJavaStringToUTF16(java_result);
 }
 
 bool RegisterLocaleUtils(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android
 }  // namespace base