Merge latest oemcrypto-v17 change

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

Bug: 161477208
Change-Id: I99e4780f6855b7045aa0cd5a49c13d2d0d51ed64

libwvdrmengine/level3/src/level3_file_system_android.cpp

@@ -10,8 +10,8 @@
 #include "properties.h"
 #include "wv_cdm_types.h"
 
-using wvcdm::File;
-using wvcdm::FileSystem;
+using wvutil::File;
+using wvutil::FileSystem;
 
 namespace wvoec3 {
 
@@ -32,8 +32,8 @@ OEMCrypto_Level3AndroidFileSystem::OEMCrypto_Level3AndroidFileSystem()
   while (pos < size) {
     base_path_[pos] = '\0';
     if (mkdir(base_path_.c_str(), 0775) != 0 && errno != EEXIST) {
-      wvcdm::Log(
-          "", "", 0, wvcdm::LOG_ERROR,
+      wvutil::Log(
+          "", "", 0, wvutil::LOG_ERROR,
           "Could not create base directories for Level3FileSystem, error: %s\n",
           strerror(errno));
     }