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/arraysize.h

@@ -7,7 +7,7 @@
 
 #include <stdint.h>
 
-namespace wvutil {
+namespace wvcdm {
 
 // Returns the size of a fixed-length array.
 template <typename T, size_t N>
@@ -15,6 +15,6 @@ constexpr size_t ArraySize(const T (&)[N]) {
   return N;
 }
 
-}  // namespace wvutil
+}  // namespace wvcdm
 
 #endif  // WVCDM_UTIL_ARRAYSIZE_H_