Revert of media: Move widevine CDM targets to WidevineCdm folder

chrome/tools/build/linux/FILES.cfg

Index: chrome/tools/build/linux/FILES.cfg
diff --git a/chrome/tools/build/linux/FILES.cfg b/chrome/tools/build/linux/FILES.cfg
index 495701cbdc4ab23adb982763f470487f5ea9a202..2b3b3b97ca9fbfd16f443fa705c61b740b35ec90 100644
--- a/chrome/tools/build/linux/FILES.cfg
+++ b/chrome/tools/build/linux/FILES.cfg
@@ -109,20 +109,20 @@
   },
   # CDM files (each has an adapter and the actual CDM):
   {
-    'filename': 'ClearKeyCdm/libclearkeycdmadapter.so',
-    'buildtype': ['dev', 'official'],
-  },
-  {
-    'filename': 'ClearKeyCdm/libclearkeycdm.so',
-    'buildtype': ['dev', 'official'],
-  },
-  {
-    'filename': 'WidevineCdm/libwidevinecdmadapter.so',
+    'filename': 'libclearkeycdmadapter.so',
+    'buildtype': ['dev', 'official'],
+  },
+  {
+    'filename': 'libclearkeycdm.so',
+    'buildtype': ['dev', 'official'],
+  },
+  {
+    'filename': 'libwidevinecdmadapter.so',
     'arch': ['32bit', '64bit'],
     'buildtype': ['official'],
   },
   {
-    'filename': 'WidevineCdm/libwidevinecdm.so',
+    'filename': 'libwidevinecdm.so',
     'arch': ['32bit', '64bit'],
     'buildtype': ['official'],
     'direct_archive': 1,