Pull ICU, rename component build GN variables.

build/config/android/config.gni

Index: build/config/android/config.gni
diff --git a/build/config/android/config.gni b/build/config/android/config.gni
index 32ac6d4c328c9a2d734046ae094625f321175ddc..b0c7e482d2770c406548a9f2f4055d66956657e0 100644
--- a/build/config/android/config.gni
+++ b/build/config/android/config.gni
@@ -165,17 +165,13 @@ if (is_android) {
   # Toolchain stuff ------------------------------------------------------------
 
   android_libcpp_root = "$android_ndk_root/sources/cxx-stl/llvm-libc++"
-  if (component_mode == "shared_library") {
+  if (is_component_build) {
     android_libcpp_library = "c++_shared"
-  } else {
-    android_libcpp_library = "c++_static"
-  }
-
-  if (component_mode == "shared_library") {
     # By appending .cr, we prevent name collisions with libraries already
     # loaded by the Android zygote.
     android_product_extension = ".cr.so"
   } else {
+    android_libcpp_library = "c++_static"
     android_product_extension = ".so"
   }