Update from https://crrev.com/329939

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 UI-related build flags. It should theoretically be in the
 # src/ui directory and only things that depend on the ui module should get the
 # definitions.
 #
 # However, today we have many "bad" dependencies on some of these flags from,
 # e.g. base, so they need to be global.
@@ skipping 15 matching lines @@
   # TODO(GYP): Get NaCl linking on other platforms.
   # Also, see if we can always get rid of enable_nacl_untrusted and
   # enable_pnacl and always build them if enable_nacl is true.
   # The "is_nacl" part of the condition is needed to ensure that
   # the untrusted code is built properly; arguably it should be
   # guarded by "is_nacl" directly rather than enable_nacl_untrusted, but
   # this will go away when Mac and Win are working and we can just use
   # 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
 
   # If debug_devtools is set to true, JavaScript files for DevTools are stored
   # as is and loaded from disk. Otherwise, a concatenated file is stored in
   # resources.pak. It is still possible to load JS files from disk by passing
   # --debug-devtools cmdline switch.
   debug_devtools = false
 
   # Enables WebRTC.
   # TODO(GYP) make mac and android work.
   enable_webrtc = !is_ios && !is_mac && !is_android
 
   # Enables the Media Router.
   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
 
   # Enables support for background apps.
   enable_background = !is_ios && !is_android
 
   enable_captive_portal_detection = !is_android && !is_ios
 
   # Enables use of the session service, which is enabled by default.
   # Android stores them separately on the Java side.
@@ skipping 13 matching lines @@
 
   enable_remoting = !is_ios && !is_android
 
   # Enable hole punching for the protected video.
   enable_video_hole = is_android
 
   # Enables browser side Content Decryption Modules. Required for embedders
   # (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) {
     safe_browsing_mode = 0
   } else {
     safe_browsing_mode = 1
   }
 }
 
 # Additional dependent variables -----------------------------------------------
@@ skipping 79 matching lines @@
 # TODO(GYP) also require !embedded to enable.
 use_gconf = is_linux && !is_chromeos
 
 # Hangout services is an extension that adds extra features to Hangouts.
 # For official GYP builds, this flag is set, it will likely need to be
 # parameterized in the future for a similar use.
 enable_hangout_services_extension = false
 
 # Whether to back up data before sync.
 enable_pre_sync_backup = is_win || is_mac || (is_linux && !is_chromeos)