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);