Update from https://crrev.com/304121

build/config/features.gni

Index: build/config/features.gni
diff --git a/build/config/features.gni b/build/config/features.gni
index a395b406c977e176fd25edd4162be717726e79ef..575a89cbb1dbee71482287e6afc044a10157af4c 100644
--- a/build/config/features.gni
+++ b/build/config/features.gni
@@ -77,9 +77,8 @@ enable_print_preview = !is_android
 use_seccomp_bpf = (is_linux || is_android) &&
   (cpu_arch == "x86" || cpu_arch == "x64" || cpu_arch == "arm")
 
-# Enable notifications everywhere except Android/iOS.
-# Android is http://crbug.com/115320
-enable_notifications = !is_android && !is_ios
+# Enable notifications everywhere except iOS.
+enable_notifications = !is_ios
 
 # TODO(brettw) this should be moved to net and only dependents get this define.
 disable_ftp_support = is_ios
@@ -105,17 +104,6 @@ if (is_android) {
 
 enable_configuration_policy = true
 
-# The data acquisition mode for CLD2. Possible values are:
-#   static:     CLD2 data is statically linked to the executable.
-#   standalone: CLD2 data is provided in a standalone file that is
-#               bundled with the executable.
-#   component:  CLD2 data is provided as a Chrome "component" and is
-#               downloaded via the component updater.
-#
-# For more information on switching the CLD2 data source, see:
-#   https://sites.google.com/a/chromium.org/dev/developers/how-tos/compact-language-detector-cld-data-source-configuration
-cld2_data_source = "static"
-
 # Enables support for background apps.
 enable_background = !is_ios && !is_android