Merge "Enable 64-bit Android Builds"

libwvdrmengine/cdm/core/test/cdm_engine_test.cpp

@@ -98,8 +98,13 @@ class WvCdmEngineTest : public testing::Test {
     std::string message;
     bool ok = url_request.GetResponse(&message);
     EXPECT_TRUE(ok);
+    // One of many reasons a device might fail to provision is that the server
+    // rejects its keybox.  In that case, we usually see an error of
+    // CERT_PROVISIONING_RESPONSE_ERROR_1.  The error response may help
+    // somebody look through the server logs for more clues.
     ASSERT_EQ(NO_ERROR, cdm_engine_.HandleProvisioningResponse(message, &cert,
-                                                               &wrapped_key));
+                                                               &wrapped_key))
+        << "Error response: " << message;
   }
 
   void GenerateKeyRequest(const std::string& key_id,