Revert of media: Move widevine CDM targets to WidevineCdm folder

chrome/installer/linux/BUILD.gn

 # Copyright 2015 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/chrome_build.gni")
 import("//build/config/features.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/util/version.gni")
 import("//chrome/version.gni")
 
@@ skipping 202 matching lines @@
 
     "$root_out_dir/nacl_helper",
     "$root_out_dir/nacl_helper_bootstrap",
     "$root_out_dir/PepperFlash/libpepflashplayer.so",
     "$root_out_dir/PepperFlash/manifest.json",
   ]
 
   if (current_cpu == "x86") {
     packaging_files_binaries += [
       "$root_out_dir/nacl_irt_x86_32.nexe",
-      "$root_out_dir/WidevineCdm/libwidevinecdmadapter.so",
-      "$root_out_dir/WidevineCdm/libwidevinecdm.so",
+      "$root_out_dir/libwidevinecdmadapter.so",
+      "$root_out_dir/libwidevinecdm.so",
     ]
   } else if (current_cpu == "x64") {
     packaging_files_binaries += [
       "$root_out_dir/nacl_irt_x86_64.nexe",
-      "$root_out_dir/WidevineCdm/libwidevinecdmadapter.so",
-      "$root_out_dir/WidevineCdm/libwidevinecdm.so",
+      "$root_out_dir/libwidevinecdmadapter.so",
+      "$root_out_dir/libwidevinecdm.so",
     ]
   } else if (current_cpu == "arm") {
     packaging_files_binaries += [ "$root_out_dir/nacl_irt_arm.nexe" ]
   }
   if (is_asan) {
     packaging_files_binaries += [ "$root_out_dir/lib/libc++.so" ]
   }
 
   deb_target_name = "${target_name}_deb"
   action(deb_target_name) {
@@ skipping 99 matching lines @@
 # Other packages that we support that aren't included in the default "linux"
 # target.
 linux_package("trunk") {
   channel = "trunk"
 }
 if (is_asan) {
   linux_package("asan") {
     channel = "asan"
   }
 }