Revert of Refactor MediaCodecBridge to add support for NDK APIs

media/base/android/BUILD.gn

Index: media/base/android/BUILD.gn
diff --git a/media/base/android/BUILD.gn b/media/base/android/BUILD.gn
index 75c6717c1bf287c2fd50172a48968aa3c85be778..c51ee6b2cb71a0d84dab4009fa7ce2981b2fca9c 100644
--- a/media/base/android/BUILD.gn
+++ b/media/base/android/BUILD.gn
@@ -31,8 +31,6 @@ source_set("android") {
     "media_codec_decoder.h",
     "media_codec_player.cc",
     "media_codec_player.h",
-    "media_codec_util.cc",
-    "media_codec_util.h",
     "media_codec_video_decoder.cc",
     "media_codec_video_decoder.h",
     "media_decoder_job.cc",
@@ -60,8 +58,6 @@ source_set("android") {
     "media_task_runner.h",
     "media_url_interceptor.h",
     "provision_fetcher.h",
-    "sdk_media_codec_bridge.cc",
-    "sdk_media_codec_bridge.h",
     "video_decoder_job.cc",
     "video_decoder_job.h",
     "webaudio_media_codec_bridge.cc",
@@ -85,12 +81,12 @@ source_set("unittests") {
   testonly = true
   sources = [
     "access_unit_queue_unittest.cc",
+    "media_codec_bridge_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",
@@ -110,7 +106,6 @@ generate_jni("media_jni_headers") {
     "java/src/org/chromium/media/AudioManagerAndroid.java",
     "java/src/org/chromium/media/AudioRecordInput.java",
     "java/src/org/chromium/media/MediaCodecBridge.java",
-    "java/src/org/chromium/media/MediaCodecUtil.java",
     "java/src/org/chromium/media/MediaDrmBridge.java",
     "java/src/org/chromium/media/MediaPlayerBridge.java",
     "java/src/org/chromium/media/MediaPlayerListener.java",