Revert "Merge latest oemcrypto-v17 change"

This reverts commit 642965c678.

Reason for revert: Droidfood Blocking Bug: 217145027

Change-Id: I669b72fcd91c62e28883b5f55eb36af274d85806
(cherry picked from commit 8dbea15e5da05b371572297041454569dc166c90)
Merged-In:I669b72fcd91c62e28883b5f55eb36af274d85806

libwvdrmengine/cdm/util/include/file_utils.h

@@ -5,7 +5,9 @@
 #include <string>
 #include <vector>
 
-namespace wvutil {
+#include "wv_cdm_types.h"
+
+namespace wvcdm {
 
 const char kCurrentDirectory[] = ".";
 const char kParentDirectory[] = "..";
@@ -25,4 +27,4 @@ class FileUtils {
   static bool CreateDirectory(const std::string& path);
 };
 
-}  // namespace wvutil
+}  // namespace wvcdm