Merge latest oemcrypto-v17 change

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

Bug: 161477208
Change-Id: I99e4780f6855b7045aa0cd5a49c13d2d0d51ed64

libwvdrmengine/cdm/util/src/file_utils.cpp

@@ -15,11 +15,9 @@
 
 #include <cstring>
 
-#include "file_store.h"
 #include "log.h"
-#include "properties.h"
 
-namespace wvcdm {
+namespace wvutil {
 
 bool IsCurrentOrParentDirectory(const char* dir) {
   return strcmp(dir, kCurrentDirectory) == 0 ||
@@ -228,4 +226,4 @@ bool FileUtils::CreateDirectory(const std::string& path_in) {
   return true;
 }
 
-}  // namespace wvcdm
+}  // namespace wvutil