Merge latest oemcrypto-v17 change

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

Bug: 161477208
Change-Id: I99e4780f6855b7045aa0cd5a49c13d2d0d51ed64

libwvdrmengine/cdm/util/include/clock.h

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