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

media/BUILD.gn

Index: media/BUILD.gn
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 7535d1179aa1b49d3e444f815b8a97704ee22017..cb13534255e54b10848a162fd446cfe709bde17a 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -641,15 +641,19 @@
     sources += [
       "ffmpeg/ffmpeg_common_unittest.cc",
       "filters/audio_decoder_unittest.cc",
-      "filters/audio_file_reader_unittest.cc",
       "filters/blocking_url_protocol_unittest.cc",
-      "filters/ffmpeg_demuxer_unittest.cc",
       "filters/ffmpeg_glue_unittest.cc",
       "filters/in_memory_url_protocol_unittest.cc",
     ]
 
     if (!is_android) {
       sources += [
+        # These tests are confused by Android always having proprietary
+        # codecs enabled, but ffmpeg_branding=Chromium.  These should be
+        # fixed, http://crbug.com/570762.
+        "filters/audio_file_reader_unittest.cc",
+        "filters/ffmpeg_demuxer_unittest.cc",
+
         # FFmpeg on Android does not include video decoders.
         "filters/ffmpeg_video_decoder_unittest.cc",
       ]