am 9a150640: Merge "Let getOriginalMimeType() take a fd passed from drm java...
am 9a150640: Merge "Let getOriginalMimeType() take a fd passed from drm java applications" into jb-mr1-dev
* commit '9a150640':
Let getOriginalMimeType() take a fd passed from drm java applications