Revert "Merge latest oemcrypto-v17 change"

This reverts commit 642965c678.

Reason for revert: Droidfood Blocking Bug: 217145027

Change-Id: I669b72fcd91c62e28883b5f55eb36af274d85806
(cherry picked from commit 8dbea15e5da05b371572297041454569dc166c90)
Merged-In:I669b72fcd91c62e28883b5f55eb36af274d85806

libwvdrmengine/cdm/util/include/string_conversions.h

@@ -12,7 +12,7 @@
 
 #include "util_common.h"
 
-namespace wvutil {
+namespace wvcdm {
 
 // 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 wvutil
+}  // namespace wvcdm
 
 #endif  // WVCDM_UTIL_STRING_CONVERSIONS_H_