Revert of media: Move widevine CDM targets to WidevineCdm folder

chrome/installer/linux/common/installer.include

 # Recursively replace @@include@@ template variables with the referenced file,
 # and write the resulting text to stdout.
 process_template_includes() {
   INCSTACK+="$1->"
   # Includes are relative to the file that does the include.
   INCDIR=$(dirname $1)
   # Clear IFS so 'read' doesn't trim whitespace
   local OLDIFS="$IFS"
   IFS=''
   while read -r LINE
@@ skipping 141 matching lines @@
   # the code looks for, but the build targets can't use hyphens (scons bug?)
   install -m 4755 -s "${BUILDDIR}/${PROGNAME}_sandbox" \
     "${STAGEDIR}/${INSTALLDIR}/${PROGNAME}-sandbox"
 
   # l10n paks
   cp -a "${BUILDDIR}/locales" "${STAGEDIR}/${INSTALLDIR}/"
   find "${STAGEDIR}/${INSTALLDIR}/locales" -type f -exec chmod 644 '{}' \;
   find "${STAGEDIR}/${INSTALLDIR}/locales" -type d -exec chmod 755 '{}' \;
 
   # Widevine CDM.
-  WIDEVINECDM_SRCDIR="${BUILDDIR}/WidevineCdm"
-  WIDEVINECDM_DESTDIR="${STAGEDIR}/${INSTALLDIR}/WidevineCdm"
-  if [ -f "${WIDEVINECDM_SRCDIR}/libwidevinecdmadapter.so" ]; then
-    install -m 755 -d "${WIDEVINECDM_DESTDIR}"
-    install -m 644 -s "${WIDEVINECDM_SRCDIR}/libwidevinecdmadapter.so" \
-      "${WIDEVINECDM_DESTDIR}/"
-    install -m 644 "${WIDEVINECDM_SRCDIR}/libwidevinecdm.so" \
-      "${WIDEVINECDM_DESTDIR}/"
+  if [ -f "${BUILDDIR}/libwidevinecdmadapter.so" ]; then
+    install -m 644 -s "${BUILDDIR}/libwidevinecdmadapter.so" "${STAGEDIR}/${INSTALLDIR}/"
+    install -m 644 "${BUILDDIR}/libwidevinecdm.so" "${STAGEDIR}/${INSTALLDIR}/"
   fi
 
   # ANGLE
   if [ "${CHANNEL}" != "stable" ]; then
     install -m 644 "${BUILDDIR}/libGLESv2.so" "${STAGEDIR}/${INSTALLDIR}/"
     install -m 644 "${BUILDDIR}/libEGL.so" "${STAGEDIR}/${INSTALLDIR}/"
   fi
 
   # Pepper Flash.
   PEPPERFLASH_SRCDIR="${BUILDDIR}/PepperFlash"
@@ skipping 71 matching lines @@
     "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}.xml"
   chmod 644 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}.xml"
   process_template "${BUILDDIR}/installer/common/default-app-block.template" \
     "${STAGEDIR}${INSTALLDIR}/default-app-block"
   chmod 644 "${STAGEDIR}${INSTALLDIR}/default-app-block"
 
   # documentation
   install -m 755 "${BUILDDIR}/${PROGNAME}.1" \
     "${STAGEDIR}/usr/share/man/man1/${PACKAGE}.1"
 }