Merge latest oemcrypto-v17 change

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

Bug: 161477208
Change-Id: I99e4780f6855b7045aa0cd5a49c13d2d0d51ed64

libwvdrmengine/cdm/util/test/cdm_random_unittest.cpp

@@ -2,6 +2,10 @@
 // source code may only be used and distributed under the Widevine License
 // Agreement.
 
+#include "cdm_random.h"
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
 #include <stdlib.h>
 
 #include <algorithm>
@@ -12,12 +16,7 @@
 #include <type_traits>
 #include <vector>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#include "cdm_random.h"
-
-namespace wvcdm {
+namespace wvutil {
 
 namespace {
 // Random data vector lengths.
@@ -184,4 +183,4 @@ TEST(CdmRandomTest, AllMethods) {
   CdmRandom::RandomBool();
 }
 
-}  // namespace wvcdm
+}  // namespace wvutil