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

media/base/android/BUILD.gn

 # 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.
 
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//build/config/arm.gni")
 import("//build/config/ui.gni")
 import("//media/media_options.gni")
 
@@ skipping 65 matching lines @@
     "//ui/gl",
     "//url",
   ]
 }
 
 source_set("unittests") {
   testonly = true
   sources = [
     "access_unit_queue_unittest.cc",
     "media_codec_decoder_unittest.cc",
+    "media_codec_player_unittest.cc",
     "media_drm_bridge_unittest.cc",
     "media_player_bridge_unittest.cc",
     "media_source_player_unittest.cc",
     "sdk_media_codec_bridge_unittest.cc",
     "test_data_factory.cc",
     "test_data_factory.h",
     "test_statistics.h",
   ]
-
-  if (proprietary_codecs) {
-    sources += [ "media_codec_player_unittest.cc" ]
-  }
-
   deps = [
     ":android",
     "//media/base:test_support",
     "//testing/gmock",
     "//testing/gtest",
     "//third_party/widevine/cdm:version_h",
   ]
   configs += [ "//media:media_config" ]
 }
 
@@ skipping 10 matching lines @@
   jni_package = "media"
 }
 
 android_library("media_java") {
   deps = [
     "//base:base_java",
   ]
 
   DEPRECATED_java_in_dir = "java/src"
 }