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

@@ -9,7 +9,7 @@
 
 #include <stdint.h>
 
-namespace wvutil {
+namespace wvcdm {
 
 // Provides time related information. The implementation is platform dependent.
 class Clock {
@@ -21,6 +21,6 @@ class Clock {
   virtual int64_t GetCurrentTime();
 };
 
-}  // namespace wvutil
+}  // namespace wvcdm
 
 #endif  // WVCDM_UTIL_CLOCK_H_