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/cdm_random_unittest.cpp

@@ -2,10 +2,6 @@
 // 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>
@@ -16,7 +12,12 @@
 #include <type_traits>
 #include <vector>
 
-namespace wvutil {
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+#include "cdm_random.h"
+
+namespace wvcdm {
 
 namespace {
 // Random data vector lengths.
@@ -183,4 +184,4 @@ TEST(CdmRandomTest, AllMethods) {
   CdmRandom::RandomBool();
 }
 
-}  // namespace wvutil
+}  // namespace wvcdm