Update Android to use Compact Language Detector v2.

build/config/features.gni

 # 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.
 
 # This file contains Chrome-feature-related build flags (see ui.gni for
 # UI-related ones). These should theoretically be moved to the build files of
 # the features themselves.
 #
 # However, today we have many "bad" dependencies on some of these flags from,
 # e.g. base, so they need to be global to match the GYP configuration. Also,
@@ skipping 107 matching lines @@
 
   # Set to true make a build that disables activation of field trial tests
   # specified in testing/variations/fieldtrial_testing_config_*.json.
   # Note: this setting is ignored if is_chrome_branded.
   fieldtrial_testing_like_official_build = is_chrome_branded
 }
 
 # 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
 
 # Enable the spell checker.
 enable_spellcheck = !is_ios
 
 # Use the operating system's spellchecker rather than hunspell.
 use_browser_spellchecker = is_android || is_mac
 
@@ skipping 58 matching lines @@
 # system).
 # TODO(GYP) also require !embedded to enable.
 use_gconf = is_linux && !is_chromeos
 
 # Whether to back up data before sync.
 enable_pre_sync_backup = is_win || is_mac || (is_linux && !is_chromeos)
 
 # Enable WebVR support by default on Android
 # Still requires command line flag to access API
 enable_webvr = is_android