Merge latest oemcrypto-v17 change

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

Bug: 161477208
Change-Id: I99e4780f6855b7045aa0cd5a49c13d2d0d51ed64

libwvdrmengine/cdm/util/include/string_conversions.h

@@ -12,7 +12,7 @@
 
 #include "util_common.h"
 
-namespace wvcdm {
+namespace wvutil {
 
 // ASCII hex to Binary conversion.
 CORE_UTIL_EXPORT std::vector<uint8_t> a2b_hex(const std::string& b);
@@ -58,6 +58,6 @@ CORE_UTIL_EXPORT inline int64_t ntohll64(int64_t x) { return htonll64(x); }
 // Encode unsigned integer into a big endian formatted string.
 CORE_UTIL_EXPORT std::string EncodeUint32(uint32_t u);
 
-}  // namespace wvcdm
+}  // namespace wvutil
 
 #endif  // WVCDM_UTIL_STRING_CONVERSIONS_H_