Merge "Update DrmOutputStream to use raw FileDescriptor."