Update CDM to newest license protocol definitions.

* CDM license protocol updates

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

No functional changes (yet) - all tests in widevine_ce_cdm_unittest
run successfully.

* Address android test build failures

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

Updates to the license_protocol.proto in go/wvgerrit/22789
did not include the integration tests for android.

b/34202048

Test: Reran unittests. All tests other than some oemcrypto,
request_license_test passed. Those tests failed with or without this CL.

Change-Id: Ib9041d397187859b8fcbc1b1f7d275f8c4ef6aba

libwvdrmengine/cdm/core/include/license.h

@@ -9,12 +9,10 @@
 #include "scoped_ptr.h"
 #include "wv_cdm_types.h"
 
-namespace video_widevine_server {
-namespace sdk {
+namespace video_widevine {
 class SignedMessage;
 class LicenseRequest;
-}
-}  // namespace video_widevine_server
+}  // namespace video_widevine
 
 namespace wvcdm {
 
@@ -68,12 +66,12 @@ class CdmLicense {
                                         std::string* server_url);
 
   CdmResponseType HandleKeyErrorResponse(
-      const video_widevine_server::sdk::SignedMessage& signed_message);
+      const video_widevine::SignedMessage& signed_message);
 
   CdmResponseType PrepareClientId(
       bool encrypt, const std::string& certificate,
       const CdmAppParameterMap& app_parameters,
-      video_widevine_server::sdk::LicenseRequest* license_request);
+      video_widevine::LicenseRequest* license_request);
   template <typename T>
   bool PrepareContentId(const CdmLicenseType license_type,
                         const std::string& request_id, T* content_id);

libwvdrmengine/cdm/core/include/license_key_status.h

@@ -53,10 +53,10 @@ class LicenseKeys {
   // Extracts the keys from a license and makes them available for
   // querying usage and constraint settings.
   virtual void SetFromLicense(
-      const video_widevine_server::sdk::License& license);
+      const video_widevine::License& license);
 
  private:
-  typedef ::video_widevine_server::sdk::License::KeyContainer KeyContainer;
+  typedef ::video_widevine::License::KeyContainer KeyContainer;
   typedef std::map<wvcdm::KeyId, LicenseKeyStatus*>::const_iterator
       LicenseKeyStatusIterator;
 
@@ -101,7 +101,7 @@ class LicenseKeyStatus {
       uint32_t new_resolution, CryptoSession::HdcpCapability new_hdcp_level);
 
  protected:
-  typedef ::video_widevine_server::sdk::License::KeyContainer KeyContainer;
+  typedef ::video_widevine::License::KeyContainer KeyContainer;
   typedef KeyContainer::OperatorSessionKeyPermissions
       OperatorSessionKeyPermissions;
   typedef KeyContainer::OutputProtection OutputProtection;

libwvdrmengine/cdm/core/include/policy_engine.h

@@ -13,7 +13,7 @@
 
 namespace wvcdm {
 
-using video_widevine_server::sdk::LicenseIdentification;
+using video_widevine::LicenseIdentification;
 
 class Clock;
 class CryptoSession;
@@ -43,12 +43,12 @@ class PolicyEngine {
   // an exact copy of the policy information stored in the license.
   // The license state transitions to kLicenseStateCanPlay if the license
   // permits playback.
-  virtual void SetLicense(const video_widevine_server::sdk::License& license);
+  virtual void SetLicense(const video_widevine::License& license);
 
   // SetLicenseForRelease is used when releasing a license. The keys in this
   // license will be ignored, and any old keys will be expired.
   virtual void SetLicenseForRelease(
-      const video_widevine_server::sdk::License& license);
+      const video_widevine::License& license);
 
   // Call this on first decrypt to set the start of playback.
   virtual void BeginDecryption(void);
@@ -60,7 +60,7 @@ class PolicyEngine {
   // updated license_start_time from the server. The license will transition to
   // kLicenseStateCanPlay if the license permits playback.
   virtual void UpdateLicense(
-      const video_widevine_server::sdk::License& license);
+      const video_widevine::License& license);
 
   // Used for notifying the Policy Engine of resolution changes
   virtual void NotifyResolution(uint32_t width, uint32_t height);
@@ -146,12 +146,12 @@ class PolicyEngine {
 
   // This is the current policy information for this license. This gets updated
   // as license renewals occur.
-  video_widevine_server::sdk::License::Policy policy_;
+  video_widevine::License::Policy policy_;
 
   // This is the license id field from server response. This data gets passed
   // back to the server in each renewal request. When we get a renewal response
   // from the license server we will get an updated id field.
-  video_widevine_server::sdk::LicenseIdentification license_id_;
+  video_widevine::LicenseIdentification license_id_;
 
   // The server returns the license start time in the license/license renewal
   // response based off the request time sent by the client in the