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

@@ -5,12 +5,12 @@
 #ifndef WVCDM_UTIL_DISALLOW_COPY_AND_ASSIGN_H_
 #define WVCDM_UTIL_DISALLOW_COPY_AND_ASSIGN_H_
 
-namespace wvutil {
+namespace wvcdm {
 
 #define CORE_DISALLOW_COPY_AND_ASSIGN(TypeName) \
   TypeName(const TypeName&);                    \
   void operator=(const TypeName&)
 
-}  // namespace wvutil
+}  // namespace wvcdm
 
 #endif  //  WVCDM_UTIL_DISALLOW_COPY_AND_ASSIGN_H_