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/include/cdm_engine.h

@@ -195,9 +195,6 @@ class CdmEngine {
   // system. This will force the device to reprovision itself.
   virtual CdmResponseType Unprovision(CdmSecurityLevel security_level);
 
-  // Delete OEMCrypto usage tables. Used by Unprovision().
-  virtual CdmResponseType DeleteUsageTable(CdmSecurityLevel security_level);
-
   // Return the list of key_set_ids stored on the current (origin-specific)
   // file system.
   virtual CdmResponseType ListStoredLicenses(
@@ -364,7 +361,6 @@ class CdmEngine {
                               const CdmSessionId* forced_session_id,
                               CdmSessionId* session_id);
 
-  void DeleteAllUsageReportsUponFactoryReset();
   bool ValidateKeySystem(const CdmKeySystem& key_system);
   CdmResponseType GetUsageInfo(const std::string& app_id,
                                SecurityLevel requested_security_level,
@@ -396,7 +392,10 @@ class CdmEngine {
   Clock clock_;
   std::string spoid_;
 
-  // usage related variables
+  // Usage related variables
+  // Used to isolate a single active usage information license.  Loading,
+  // creating or releasing a different usage licenses through the engine
+  // API will release the handle to previously active secure stop license.
   std::unique_ptr<CdmSession> usage_session_;
   std::unique_ptr<UsagePropertySet> usage_property_set_;
   int64_t last_usage_information_update_time_;