Update from https://crrev.com/327068

build/config/features.gni

Index: build/config/features.gni
diff --git a/build/config/features.gni b/build/config/features.gni
index 783e32d5d37fb6fcc4e42b7f888d648b339a86f9..dd7b0819b55e4f5258e5e6789549cbf91a645c0b 100644
--- a/build/config/features.gni
+++ b/build/config/features.gni
@@ -47,6 +47,9 @@ declare_args() {
   # 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
 
@@ -67,13 +70,20 @@ declare_args() {
 
   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 -----------------------------------------------
@@ -96,8 +106,6 @@ 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