Merge latest oemcrypto-v17 change

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

Bug: 161477208
Change-Id: I99e4780f6855b7045aa0cd5a49c13d2d0d51ed64

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 <utility>
-
 #include <gtest/gtest.h>
 
+#include <utility>
+
 #include "log.h"
 #include "string_conversions.h"
 
-namespace wvcdm {
+namespace wvutil {
 
 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 wvcdm
+}  // namespace wvutil