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

@@ -13,7 +13,7 @@
 #include "disallow_copy_and_assign.h"
 #include "util_common.h"
 
-namespace wvutil {
+namespace wvcdm {
 
 // 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 wvutil
+}  // namespace wvcdm
 
 #endif  // WVCDM_UTIL_RW_LOCK_H_