Merge latest oemcrypto-v17 change

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

Bug: 161477208
Change-Id: I99e4780f6855b7045aa0cd5a49c13d2d0d51ed64

libwvdrmengine/cdm/util/test/test_sleep.cpp

@@ -22,7 +22,7 @@
 #include "clock.h"
 #include "log.h"
 
-namespace wvcdm {
+namespace wvutil {
 
 bool TestSleep::real_sleep_ = true;
 TestSleep::CallBack* TestSleep::callback_ = nullptr;
@@ -157,4 +157,4 @@ bool TestSleep::CanChangeSystemTime() {
   return false;
 #endif
 }
-}  // namespace wvcdm
+}  // namespace wvutil