Merge latest oemcrypto-v17 change

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

Bug: 161477208
Change-Id: I99e4780f6855b7045aa0cd5a49c13d2d0d51ed64

libwvdrmengine/cdm/util/test/test_clock.cpp

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