Merge latest oemcrypto-v17 change

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

Bug: 161477208
Change-Id: I99e4780f6855b7045aa0cd5a49c13d2d0d51ed64

libwvdrmengine/cdm/util/include/rw_lock.h

@@ -13,7 +13,7 @@
 #include "disallow_copy_and_assign.h"
 #include "util_common.h"
 
-namespace wvcdm {
+namespace wvutil {
 
 // A simple reader-writer mutex implementation that mimics the one from C++17
 class CORE_UTIL_EXPORT shared_mutex {
@@ -60,6 +60,6 @@ class shared_lock {
   CORE_DISALLOW_COPY_AND_ASSIGN(shared_lock);
 };
 
-}  // namespace wvcdm
+}  // namespace wvutil
 
 #endif  // WVCDM_UTIL_RW_LOCK_H_