Merge latest oemcrypto-v17 change

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

Bug: 161477208
Change-Id: I99e4780f6855b7045aa0cd5a49c13d2d0d51ed64

libwvdrmengine/cdm/util/src/string_conversions.cpp

@@ -14,7 +14,7 @@
 #include "log.h"
 #include "platform.h"
 
-namespace wvcdm {
+namespace wvutil {
 namespace {
 // Base64 character set, indexed for their 6-bit mapping, plus '='.
 const char kBase64Codes[] =
@@ -326,4 +326,4 @@ std::string EncodeUint32(unsigned int u) {
   return s;
 }
 
-}  // namespace wvcdm
+}  // namespace wvutil