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

@@ -2,14 +2,14 @@
 // source code may only be used and distributed under the Widevine License
 // Agreement.
 
-#include <gtest/gtest.h>
-
 #include <utility>
 
+#include <gtest/gtest.h>
+
 #include "log.h"
 #include "string_conversions.h"
 
-namespace wvutil {
+namespace wvcdm {
 
 namespace {
 
@@ -189,4 +189,4 @@ TEST_F(HtoNLL64Test, NegativeNumber) {
   int64_t host_byte_order = htonll64(*network_byte_order);
   EXPECT_EQ(-0x01FdFcFbFaF9F8F8, host_byte_order);
 }
-}  // namespace wvutil
+}  // namespace wvcdm