(reland) media: Use platform specific folders for CDMs

chrome/tools/build/win/FILES.cfg

 # -*- python -*-
 # ex: set syntax=python:
 
 # Copyright (c) 2012 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.
 
 # This is a buildbot configuration file containing a tagged list of files
 # processed by the stage/archive scripts. The known tags are:
 #
@@ skipping 332 matching lines @@
   {
     'filename': 'PepperFlash/pepflashplayer.dll',
     'buildtype': ['official'],
   },
   {
     'filename': 'PepperFlash/manifest.json',
     'buildtype': ['official'],
   },
   # Widevine CDM adapter files:
   {
-    'filename': 'widevinecdmadapter.dll',
+    'filename': 'WidevineCdm/_platform_specific/win_x86/widevinecdmadapter.dll',
+    'arch': ['32bit'],
+    'buildtype': ['official'],
+  },
+  {
+    'filename': 'WidevineCdm/_platform_specific/win_x64/widevinecdmadapter.dll',
+    'arch': ['64bit'],
     'buildtype': ['official'],
   },
   # ANGLE files:
   {
     'filename': 'D3DCompiler_47.dll',
     'buildtype': ['dev', 'official'],
   },
   {
     'filename': 'libEGL.dll',
     'buildtype': ['dev', 'official'],
@@ skipping 286 matching lines @@
     'arch': ['32bit'],
     'buildtype': ['official'],
     'archive': 'chrome-win32-nacl-irt-syms.zip',
   },
   {
     'filename': 'nacl_irt_x86_64.nexe.debug',
     'buildtype': ['official'],
     'archive': 'chrome-win32-nacl-irt-syms.zip',
   },
 ]