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/test/test_clock.cpp

@@ -4,12 +4,13 @@
 //
 // Clock - A fake clock just for running tests.
 
+#include "clock.h"
+
 #include <chrono>
 
-#include "clock.h"
 #include "test_sleep.h"
 
-namespace wvutil {
+namespace wvcdm {
 
 namespace {
 // A fake clock that only advances when TestSleep::Sleep is called.
@@ -39,4 +40,4 @@ int64_t Clock::GetCurrentTime() {
   return g_fake_clock->now() / 1000;
 }
 
-}  // namespace wvutil
+}  // namespace wvcdm