Update Android to use Compact Language Detector v2.

Android is the last remaining platform that has not yet converted to CLDv2.
Sheriffs: expect to see APK size changes in the range of [-122K, +98K] bytes.
See the bug for more information.

As on iOS, use the smallest data tables to minimize the binary size impact.
This brings language detection on Android into parity with iOS (which also uses
the smallest data tables).

BUG=528257

Review URL: https://codereview.chromium.org/1327543003

Cr-Original-Commit-Position: refs/heads/master@{#347418}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 9a70dc32d62dc1a0e9a8885f2258fe612aeb1f06

common.gypi

@@ -557,13 +557,12 @@
       'enable_print_preview%': 1,
 
       # Set the version of CLD.
-      #   1: Use only CLD1.
+      #   1: (DEPRECATED! See http://crbug.com/528305 for info) Use only CLD1.
       #   2: Use only CLD2.
       'cld_version%': 2,
 
       # For CLD2, the size of the tables that should be included in the build
-      # Only evaluated if cld_version == 2 or if building the CLD2 dynamic data
-      # tool explicitly.
+      # Only evaluated if cld_version == 2.
       # See third_party/cld_2/cld_2.gyp for more information.
       #   0: Small tables, lower accuracy
       #   2: Large tables, high accuracy
@@ -817,7 +816,7 @@
         ['OS=="android"', {
           'enable_extensions%': 0,
           'enable_google_now%': 0,
-          'cld_version%': 1,
+          'cld2_table_size%': 0,
           'enable_themes%': 0,
           'remoting%': 0,
           'arm_neon%': 0,
@@ -869,7 +868,6 @@
           'disable_ftp_support%': 1,
           'enable_extensions%': 0,
           'enable_google_now%': 0,
-          'cld_version%': 2,
           'cld2_table_size%': 0,
           'enable_basic_printing%': 0,
           'enable_print_preview%': 0,

config/features.gni

@@ -125,14 +125,9 @@ declare_args() {
 # Additional dependent variables -----------------------------------------------
 
 # Set the version of CLD.
-#   0: Don't specify the version. This option is for the Finch testing.
-#   1: Use only CLD1.
+#   1: (DEPRECATED! See http://crbug.com/528305 for info) Use only CLD1.
 #   2: Use only CLD2.
-if (is_android) {
-  cld_version = 1
-} else {
-  cld_version = 2
-}
+cld_version = 2
 
 # libudev usage. This currently only affects the content layer.
 use_udev = is_linux