[coastguard skipped] Merge sparse cherrypicks from sparse-14491201-L17700030063614037 into udc-platform-release.

COASTGUARD_SKIP: I6efecac362757c10b2308d020440eac5edc5b873
COASTGUARD_SKIP: I68eeda016e1b51355e184fe4b12a7fe04b961361

Change-Id: I34884ae04f328cd632a3b46a950c241854ed6c39

drm/common/IDrmManagerService.cpp

diff --git a/drm/common/IDrmManagerService.cpp b/drm/common/IDrmManagerService.cpp
index 67b54f4..a6d33b0 100644
--- a/drm/common/IDrmManagerService.cpp
+++ b/drm/common/IDrmManagerService.cpp
@@ -1001,8 +1001,10 @@
             }
             const String8 key(data.readString8());
             if (key == String8("FileDescriptorKey")) {
+                char buffer[16];
                 int fd = data.readFileDescriptor();
-                drmInfoRequest->put(key, String8::format("%d", fd));
+                sprintf(buffer, "%lu", (unsigned long)fd);
+                drmInfoRequest->put(key, String8(buffer));
             } else {
                 const String8 value(data.readString8());
                 drmInfoRequest->put(key, (value == String8("NULL")) ? String8("") : value);