fix for b/4126624 Widevine DRM client not sending heartbeats

Added some missing parameters to the heartbeat message, found in end-to-end
testing with youtube.  Also enabled heartbeats on client builds.

Change-Id: I445fb0cb168e63a041f0ecf828eaad493143a648

proprietary/streamcontrol/include/WVStreamControlAPI.h

@@ -480,15 +480,19 @@ WV_IsWidevineMedia(const char *buffer, size_t length);
 // Parameters:
 //     [in] heartbeatURL - the URL of the heartbeat server
 //     [in] heartbeatPeriod - the heartbeat interval in seconds
-//
+//     [in] assetId - the asset ID
+//     [in] deviceId - the device ID
+//     [in] streamId - the streamID
+//     [in] userData - user data
 //
 // Returns:
 //     WV_Status_OK on success, otherwise one of the WVStatus values
 //     indicating the specific error.
 //
 CLIENT_API WVStatus
-WV_ConfigureHeartbeat(WVSession *session, std::string &heartbeatURL,
-                      unsigned int heartbeatPeriod);
+WV_ConfigureHeartbeat(WVSession *session, std::string &serverUrl, unsigned int period,
+                      unsigned long assetId, std::string &deviceId,
+                      std::string &streamId, std::string &userData);
 
 //
 // METHOD: WV_Teardown