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

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 Chrome-feature-related build flags (see ui.gni for
 # UI-related ones). These should theoretically be moved to the build files of
 # the features themselves.
 #
 # However, today we have many "bad" dependencies on some of these flags from,
 # e.g. base, so they need to be global to match the GYP configuration. Also,
@@ skipping 28 matching lines @@
   # resources.pak. It is still possible to load JS files from disk by passing
   # --debug-devtools cmdline switch.
   debug_devtools = false
 
   # Enables WebRTC.
   enable_webrtc = !is_ios
 
   # Enables the Media Router.
   enable_media_router = !is_ios
 
-  # Enables proprietary codecs and demuxers; e.g. H264, AAC, MP3, and MP4.
-  # We always build Google Chrome and Chromecast with proprietary codecs.
-  proprietary_codecs = is_chrome_branded || is_chromecast
+  # Enables proprietary codecs and demuxers; e.g. H264, MOV, AAC, and MP3.
+  # Android OS includes support for proprietary codecs regardless of building
+  # Chromium or Google Chrome. We also ship Google Chrome and Chromecast with
+  # proprietary codecs.
+  proprietary_codecs = is_android || is_chrome_branded || is_chromecast
 
   enable_configuration_policy = !is_ios
 
   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
@@ skipping 109 matching lines @@
 
 # Option controlling the use of GConf (the classic GNOME configuration
 # system).
 use_gconf = is_linux && !is_chromeos && !is_chromecast && !is_headless
 
 # Enable WebVR support by default on Android
 # Still requires command line flag to access API
 enable_webvr = is_android
 
 use_gio = is_linux && !is_chromeos && !is_chromecast && !is_headless