android_webview: go back to using system ICU.

android_webview/libwebviewchromium.gypi

 # Copyright 2014 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.
 {
   'type': 'shared_library',
   'android_unmangled_name': 1,
   'dependencies': [
     'android_webview_common',
   ],
   'conditions': [
@@ skipping 25 matching lines @@
       # When not using the system skia there are linker warnings about
       # overriden hidden symbols which there's no easy way to eliminate;
       # disable them. http://crbug.com/157326
       'ldflags': [
         '-Wl,--no-fatal-warnings',
       ],
       'ldflags!': [
         '-Wl,--fatal-warnings',
       ],
     }],
-    ['android_webview_build==1 and use_system_stlport==1', {
+    ['android_webview_build==1 and use_system_stlport==1 and use_system_icu==0', {
       # ICU requires RTTI, which is not present in the system's stlport, so
       # we have to include gabi++. We can't include it in icu.gyp because
       # link_settings cannot be used inside target_conditions. This will be
       # removed once we stop using the system stlport.
       # http://crbug.com/409851
       'libraries': [
         '-lgabi++',
       ],
     }],
   ],
   'sources': [
     'lib/main/webview_entry_point.cc',
   ],
 }