Merge latest oemcrypto-v17 change

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

Bug: 161477208
Change-Id: I99e4780f6855b7045aa0cd5a49c13d2d0d51ed64

libwvdrmengine/cdm/util/include/advance_iv_ctr.h

@@ -10,7 +10,7 @@
 
 #include "string_conversions.h"
 
-namespace wvcdm {
+namespace wvutil {
 
 // Advance an IV according to ISO-CENC's CTR modes. The lower half of the IV is
 // split off and treated as an unsigned 64-bit integer, then incremented by the
@@ -41,6 +41,6 @@ inline void AdvanceIvCtr(uint8_t (*subsample_iv)[16], size_t bytes) {
   memcpy(&(*subsample_iv)[kCounterIndex], &counter, kCounterSize);
 }
 
-}  // namespace wvcdm
+}  // namespace wvutil
 
 #endif  // WVCDM_UTIL_ADVANCE_IV_CTR_H_