Merges to android Pi release (part 5)

These are a set of CLs merged from the wv cdm repo to the android repo.

* Change build options for make protobuf host tools

  Author: Gene Morgan <gmorgan@google.com>

  [ Merge of http://go/wvgerrit/30381 ]

  Also revert local change to protobuf/extension_set.cc
  This builds after adding -Wno-return-type and -Wno-unused flags.

* OEMCrypto v13 stub

  Author: Rintaro Kuroiwa <rkuroiwa@google.com>

  [ Merge of http://go/wvgerrit/30004 ]

* Remove merge conflict tags

  Author: Edwin Wong <edwinwong@google.com>

  [ Merge of http://go/wvgerrit/30120 ]

  Remove merge conflict tags for http://go/wvgerrit/29880

* Added Android Things ARM provisioning key to L3

  Author: Srujan Gaddam <srujzs@google.com>

  [ Merge of http://go/wvgerrit/29701 ]

  BUG: 63443584

BUG: 71650075
Test: Not currently passing. Will be addressed in a subsequent
      commit in the chain.

Change-Id: Ifd867b491dfda5d67d2e225695535b5af9e18260

libwvdrmengine/cdm/core/include/cdm_session.h

@@ -87,8 +87,7 @@ class CdmSession {
   // ReleaseKey() - Accept response and release key.
   virtual CdmResponseType ReleaseKey(const CdmKeyResponse& key_response);
 
-  virtual CdmResponseType DeleteUsageEntry(
-      const DeviceFiles::CdmUsageData& usage_data);
+  virtual CdmResponseType DeleteUsageEntry(uint32_t usage_entry_number);
 
   virtual bool IsKeyLoaded(const KeyId& key_id);
   virtual int64_t GetDurationRemaining();
@@ -122,6 +121,10 @@ class CdmSession {
   virtual bool is_offline() { return is_offline_; }
   virtual bool is_temporary() { return is_temporary_; }
   virtual bool license_received() { return license_received_; }
+  virtual bool has_provider_session_token() {
+    return (license_parser_.get() != NULL &&
+        license_parser_->provider_session_token().size() > 0);
+  }
 
   virtual CdmUsageSupportType get_usage_support_type()
       { return usage_support_type_; }