Merge cherrypicks of ['googleplex-android-review.googlesource.com/36456371'] into udc-platform-release.

Change-Id: Idd47b2160959ce97aeaf170a4201899d2733b80c

drm/common/IDrmManagerService.cpp

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