Revert "[Android]Use zh instead of zh-rTW as output folder of zh_TW translation"

components/strings/BUILD.gn

 # 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.
 
 import("//build/config/locales.gni")
 import("//tools/grit/grit_rule.gni")
 
 if (is_android) {
   import("//build/config/android/rules.gni")
   android_components_strings_java_resources = [
@@ skipping 32 matching lines @@
     "java/res/values-sl/components_strings.xml",
     "java/res/values-sr/components_strings.xml",
     "java/res/values-sv/components_strings.xml",
     "java/res/values-sw/components_strings.xml",
     "java/res/values-th/components_strings.xml",
     "java/res/values-tl/components_strings.xml",
     "java/res/values-tr/components_strings.xml",
     "java/res/values-uk/components_strings.xml",
     "java/res/values-vi/components_strings.xml",
     "java/res/values-zh-rCN/components_strings.xml",
-    "java/res/values-zh/components_strings.xml",
+    "java/res/values-zh-rTW/components_strings.xml",
     "java/res/values/components_strings.xml",
   ]
 }
 
 group("strings") {
   public_deps = [
     ":components_chromium_strings",
     ":components_google_chrome_strings",
     ":components_locale_settings",
     ":components_strings",
@@ skipping 88 matching lines @@
     "java/res/values-sl/components_locale_settings.xml",
     "java/res/values-sr/components_locale_settings.xml",
     "java/res/values-sv/components_locale_settings.xml",
     "java/res/values-sw/components_locale_settings.xml",
     "java/res/values-th/components_locale_settings.xml",
     "java/res/values-tl/components_locale_settings.xml",
     "java/res/values-tr/components_locale_settings.xml",
     "java/res/values-uk/components_locale_settings.xml",
     "java/res/values-vi/components_locale_settings.xml",
     "java/res/values-zh-rCN/components_locale_settings.xml",
-    "java/res/values-zh/components_locale_settings.xml",
+    "java/res/values-zh-rTW/components_locale_settings.xml",
     "java/res/values/components_locale_settings.xml",
   ]
 }
 
 # GYP version: components/components_strings.gyp:components_strings
 #              (generate_components_locale_settings action)
 grit("components_locale_settings") {
   source = "../components_locale_settings.grd"
   outputs = [
     "grit/components_locale_settings.h",
@@ skipping 12 matching lines @@
     grit_output_dir = "$root_gen_dir/components/strings/java/res"
     generated_files =
         rebase_path(android_components_locale_settings_java_resources,
                     "java/res",
                     ".")
     deps = [
       ":components_locale_settings",
     ]
   }
 }