OEMCrypto v16.1

Merge of http://go/wvgerrit/93404

This CL updates the Widevine CDM to support OEMCrypto v16.1

Test: Tested in 16.2 CL
Bug: 141247171
Change-Id: I69bd993500f6fb63bf6010c8b0250dc7acc3d71b

libwvdrmengine/cdm/core/test/test_base.h

@@ -147,6 +147,12 @@ class TestLicenseHolder {
   std::vector<uint8_t> session_key_;
 };
 
+// Given a PSSH data structure, this makes a PSSH string for use in
+// generating a license request.
+std::string MakePSSH(const video_widevine::WidevinePsshData& header);
+// Given a serialized PSSH data, this generates a full PSSH string.
+std::string MakePSSH(const std::string& serialized_header);
+
 }  // namespace wvcdm
 
 #endif  // WVCDM_CORE_TEST_BASE_H_