Revert of media: Use platform specific folders for CDMs

media/cdm/ppapi/BUILD.gn

Index: media/cdm/ppapi/BUILD.gn
diff --git a/media/cdm/ppapi/BUILD.gn b/media/cdm/ppapi/BUILD.gn
index 559bfc1b888078a5193a0255ba99379d5e0e720a..4869c620445ff8da26b671b8c464966271ba0629 100644
--- a/media/cdm/ppapi/BUILD.gn
+++ b/media/cdm/ppapi/BUILD.gn
@@ -4,7 +4,6 @@
 
 import("//build/config/features.gni")
 import("//chrome/version.gni")  # TODO layering violation!
-import("//media/cdm/ppapi/cdm_paths.gni")
 import("//media/cdm/ppapi/ppapi_cdm_adapter.gni")
 import("//media/media_options.gni")
 
@@ -12,7 +11,6 @@
 # "use_vpx". These should be added here if necessary but its not clear if
 # they are required any more.
 shared_library("clearkeycdm") {
-  output_dir = "$root_out_dir/$clearkey_cdm_path"
   sources = [
     "cdm_file_io_test.cc",
     "cdm_file_io_test.h",
@@ -64,8 +62,6 @@
 }
 
 ppapi_cdm_adapter("clearkeycdmadapter") {
-  output_dir = "$root_out_dir/$clearkey_cdm_path"
-
   # Check whether the plugin's origin URL is valid.
   defines = [ "CHECK_DOCUMENT_URL" ]
   deps = [