Update from https://crrev.com/327068

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 29 matching lines @@
   # 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
 
   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.
   enable_session_service = !is_android && !is_ios
 
   enable_plugin_installation = is_win || is_mac
 
   enable_app_list = !is_ios && !is_android
 
   enable_supervised_users = !is_ios
 
-  enable_autofill_dialog = !is_ios && !(is_android && is_android_webview_build)
+  enable_autofill_dialog = !is_ios
 
   enable_google_now = !is_ios && !is_android
 
   enable_one_click_signin = is_win || is_mac || (is_linux && !is_chromeos)
 
   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
 }
 
 # 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.
 #   2: Use only CLD2.
 if (is_android) {
   cld_version = 1
 } else {
   cld_version = 2
 }
 
 # libudev usage. This currently only affects the content layer.
 use_udev = is_linux
 
 # Enable the spell checker.
 enable_spellcheck = !is_android
 
 enable_pepper_cdms = enable_plugins && (is_linux || is_mac || is_win)
 
-enable_browser_cdms = is_android
-
 # Enable basic printing support and UI.
 enable_basic_printing = !is_chromeos
 
 # Enable printing with print preview. It does not imply
 # enable_basic_printing. It's possible to build Chrome with preview only.
 enable_print_preview = !is_android
 
 # The seccomp-bpf sandbox is only supported on three architectures
 # currently.
 # Do not disable seccomp_bpf anywhere without talking to
@@ skipping 63 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)