Revert of Flip proprietary codecs to false for Android chromium builds.

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 9e010e3a5af3a60313ec19eead8ff7a6ad195bb9..6b8852f0203e2d69b89504e10a41543d9480da8e 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -833,9 +833,10 @@
           'use_browser_spellchecker%': 1,
         }],
 
-        # Enables proprietary codecs and demuxers; e.g. H264, AAC, MP3, and MP4.
-        # We always build Google Chrome and Chromecast with proprietary codecs.
-        ['branding=="Chrome" or chromecast==1', {
+        # Android OS includes support for proprietary codecs regardless of
+        # building Chromium or Google Chrome. We also ship Google Chrome and
+        # Chromecast with proprietary codecs.
+        ['OS=="android" or branding=="Chrome" or chromecast==1', {
           'proprietary_codecs%': 1,
         }, {
           'proprietary_codecs%': 0,