Migration from jb-mr2 to master for Widevine CDM

Android development of the widevine CDM has been done
on the jb-mr2 branch of the cdm code base.  This CL
contains a merge of that jb-mr2 work to CDM master, and
also reflects the evolution of the common Modular DRM
code base since jb-mr2 branched.

Change-Id: I1d7e1a12d092c00044a4298261146cb97808d4ef

libwvdrmengine/cdm/core/include/license.h

@@ -3,19 +3,20 @@
 #ifndef CDM_BASE_LICENSE_H_
 #define CDM_BASE_LICENSE_H_
 
-#include "license_protocol.pb.h"
 #include "wv_cdm_types.h"
 
-namespace wvcdm {
+namespace video_widevine_server {
+namespace sdk {
+class SignedMessage;
+}
+}  // namespace video_widevine_server
 
-using video_widevine_server::sdk::LicenseIdentification;
-using video_widevine_server::sdk::SignedMessage;
+namespace wvcdm {
 
 class CryptoSession;
 class PolicyEngine;
 
 class CdmLicense {
-
  public:
 
   CdmLicense();
@@ -42,9 +43,9 @@ class CdmLicense {
                              CdmKeyResponse& license_renewal_response);
 
 private:
-  CdmResponseType HandleKeyErrorResponse(const SignedMessage& signed_message);
+ CdmResponseType HandleKeyErrorResponse(
+     const video_widevine_server::sdk::SignedMessage& signed_message);
 
-  LicenseIdentification license_id_;
   CryptoSession* session_;
   PolicyEngine* policy_engine_;
   std::string server_url_;