Update from https://crrev.com/329939

build/config/features.gni

Index: build/config/features.gni
diff --git a/build/config/features.gni b/build/config/features.gni
index 290c1d6d831f70ad296ea8b6c5c12fe66d13b2ee..82b7d066fddf0cb180a073ac1ded0f3f1ca30a7a 100644
--- a/build/config/features.gni
+++ b/build/config/features.gni
@@ -33,8 +33,7 @@ declare_args() {
   # the commented out logic.
   # Eventually we want this to be:
   #   enable_nacl = !is_ios && !is_android
-  enable_nacl = (is_linux && !is_chromeos && !is_component_build &&
-                 current_cpu == "x64") || is_nacl
+  enable_nacl = (is_linux && !is_chromeos && current_cpu == "x64") || is_nacl
   enable_nacl_untrusted = enable_nacl
   enable_pnacl = enable_nacl_untrusted
 
@@ -52,7 +51,11 @@ declare_args() {
   enable_media_router = !is_ios && !is_android
 
   # Enables proprietary codecs and demuxers; e.g. H264, MOV, AAC, and MP3.
-  proprietary_codecs = false
+  # Android OS includes support for proprietary codecs regardless of building
+  # Chromium or Google Chrome. We also ship Google Chrome and Chromecast with
+  # proprietary codecs.
+  # TODO(GYP) The GYP build has || chromecast==1 for this:
+  proprietary_codecs = is_android || is_chrome_branded
 
   enable_configuration_policy = true
 
@@ -86,12 +89,12 @@ declare_args() {
   # (e.g. Android and ChromeCast) that use a browser side CDM.
   enable_browser_cdms = is_android
 
-  # Variable safe_browsing is used to control the build time configuration for
-  # safe browsing feature. Safe browsing can be compiled in 3 different levels:
-  # 0 disables it, 1 enables it fully, and 2 enables only UI and reporting
-  # features without enabling phishing and malware detection. This is useful to
-  # integrate a third party phishing/malware detection to existing safe browsing
-  # logic.
+  # Variable safe_browsing is used to control the build time configuration
+  # for safe browsing feature. Safe browsing can be compiled in 4 different
+  # levels: 0 disables it, 1 enables it fully, and 2 enables only UI and
+  # reporting features for use with Data Saver on Mobile, and 3 enables
+  # extended mobile protection via an external API.  When 3 is fully deployed,
+  # it will replace 2.
   if (is_android) {
     safe_browsing_mode = 2
   } else if (is_ios) {