Regular update

Plugin:
1. Process ECM v3 and send fingerprinting/service_blocking events
2. Rmove unused function Ctr128Add
3. Add support for ECM v3

OEMCrypto:
1. Update API description of OEMCrypto_LoadCasECMKeys
2. Fix android build files for ODK
3. Load content keys to shared memory
4. Move KCB check to LoadCasKeys call
5. Support even/odd content keys to share entitlement key

plugin/include/widevine_cas_session.h

@@ -7,11 +7,13 @@
 
 #include <memory>
 #include <mutex>
+#include <set>
 #include <string>
 
 #include "cas_types.h"
 #include "crypto_session.h"
 #include "ecm_parser.h"
+#include "media_cas.pb.h"
 
 namespace wvcas {
 
@@ -45,7 +47,7 @@ class WidevineCasSession {
   virtual ~WidevineCasSession();
 
   CasStatus initialize(std::shared_ptr<CryptoSession> crypto_session,
-                       uint32_t* session_id);
+                       CasEventListener* event_listener, uint32_t* session_id);
 
   // Get the current key information. This method will be used by a descrambler
   // plugin to obtain the current key information.
@@ -80,6 +82,13 @@ class WidevineCasSession {
   std::shared_ptr<CryptoSession> crypto_session_;
   // Id of the entitled key session in OEMCrypto associated with this session.
   uint32_t key_session_id_;
+  CasEventListener* event_listener_ = nullptr;
+  // Fingerprinting events sent in processing last ECM/EMM. Used to avoid
+  // sending a same event again.
+  std::vector<uint8_t> last_fingerprinting_message_;
+  // Service blocking events sent in processing last ECM/EMM. Used to avoid
+  // sending a same event again.
+  std::vector<uint8_t> last_service_blocking_message_;
 };
 
 }  // namespace wvcas