Merge latest oemcrypto-v17 change

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

Bug: 161477208
Change-Id: I99e4780f6855b7045aa0cd5a49c13d2d0d51ed64

libwvdrmengine/cdm/util/src/cdm_random.cpp

@@ -13,7 +13,7 @@
 // This type alias is for convenience.
 using CdmRandomLock = std::unique_lock<std::mutex>;
 
-namespace wvcdm {
+namespace wvutil {
 
 namespace {
 // More information about C++11's random number generators can be found
@@ -77,10 +77,10 @@ std::string CdmRandomGenerator::RandomData(size_t length) {
     return std::string();
   }
   CdmRandomLock lock(generator_lock_);
-  std::uniform_int_distribution<uint8_t> dist;  // Range of [0, 255].
+  std::uniform_int_distribution<short> dist(0, 255);  // Range of [0, 255].
   std::string random_data(length, '\0');
   std::generate(random_data.begin(), random_data.end(),
-                [&]() { return dist(generator_); });
+                [&]() { return static_cast<char>(dist(generator_)); });
   return random_data;
 }
 
@@ -104,4 +104,4 @@ CdmRandomGenerator* CdmRandom::GetInstance() {
   return g_instance;
 }
 
-}  // namespace wvcdm
+}  // namespace wvutil