Merge latest oemcrypto-v17 change

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

Bug: 161477208
Change-Id: I99e4780f6855b7045aa0cd5a49c13d2d0d51ed64

libwvdrmengine/cdm/util/src/rw_lock.cpp

@@ -6,7 +6,7 @@
 
 #include "log.h"
 
-namespace wvcdm {
+namespace wvutil {
 
 shared_mutex::~shared_mutex() {
   if (reader_count_ > 0) {
@@ -57,4 +57,4 @@ void shared_mutex::unlock() {
   condition_variable_.notify_all();
 }
 
-}  // namespace wvcdm
+}  // namespace wvutil