Merge latest oemcrypto-v17 change

No-Typo-Check: Not related to this change.

Bug: 161477208
Change-Id: I99e4780f6855b7045aa0cd5a49c13d2d0d51ed64

libwvdrmengine/cdm/util/include/file_utils.h

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