Define proprietary_codecs=1 when branding==Chrome.

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index a1ad05d4c68604c7912526770ff938f2e43bd150..4234b1e8e524c83ae4cd6db712b950fbf31a2eef 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -525,7 +525,6 @@
           'enable_google_now%': 0,
           'enable_spellcheck%': 0,
           'enable_themes%': 0,
-          'proprietary_codecs%': 1,
           'remoting%': 0,
           'arm_neon%': 0,
           'arm_neon_optional%': 1,
@@ -533,8 +532,8 @@
           'native_memory_pressure_signals%': 1,
         }],
 
-	# Enable basic printing for Chrome for Android but disable printing
-	# completely for WebView.
+        # Enable basic printing for Chrome for Android but disable printing
+        # completely for WebView.
         ['OS=="android" and android_webview_build==0', {
           'enable_printing%': 2,
         }],
@@ -542,6 +541,13 @@
           'enable_printing%': 0,
         }],
 
+        # Android OS includes support for proprietary codecs regardless of
+        # building Chromium or Google Chrome. We also ship Google Chrome with
+        # proprietary codecs.
+        ['OS=="android" or branding=="Chrome"', {
+          'proprietary_codecs%': 1,
+        }],
+
         # Enable autofill dialog for Android, Mac and Views-enabled platforms.
         ['toolkit_views==1 or (OS=="android" and android_webview_build==0) or OS=="mac"', {
           'enable_autofill_dialog%': 1