Merge latest oemcrypto-v17 change

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

Bug: 161477208
Change-Id: I99e4780f6855b7045aa0cd5a49c13d2d0d51ed64

libwvdrmengine/cdm/util/include/arraysize.h

@@ -7,7 +7,7 @@
 
 #include <stdint.h>
 
-namespace wvcdm {
+namespace wvutil {
 
 // 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 wvcdm
+}  // namespace wvutil
 
 #endif  // WVCDM_UTIL_ARRAYSIZE_H_