Support ICU on Android

sky/viewer/viewer.cc

Index: sky/viewer/viewer.cc
diff --git a/sky/viewer/viewer.cc b/sky/viewer/viewer.cc
index d38a891a7b840288de8e1ba8b97eb0e59160c874..7db37a3a3c9009e6dfe08f842b13fc6a32b0a528 100644
--- a/sky/viewer/viewer.cc
+++ b/sky/viewer/viewer.cc
@@ -7,6 +7,7 @@
 #include "base/threading/thread.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/common/tracing_impl.h"
+#include "mojo/icu/icu.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_delegate.h"
@@ -20,10 +21,6 @@
 #include "sky/viewer/document_view.h"
 #include "sky/viewer/platform/platform_impl.h"
 
-#if !defined(COMPONENT_BUILD)
-#include "base/i18n/icu_util.h"
-#endif
-
 namespace sky {
 
 // Load the viewer in testing mode so we can dump pixels.
@@ -50,11 +47,7 @@ class Viewer : public mojo::ApplicationDelegate,
     platform_impl_.reset(new PlatformImpl(app));
     blink::initialize(platform_impl_.get());
 
-    // TODO(eseidel): Haven't solved ICU data loading for MojoShell.apk yet.
-#if !defined(OS_ANDROID)
-    base::i18n::InitializeICU();
-#endif
-
+    mojo::icu::Initialize(app);
     mojo::TracingImpl::Create(app);
   }