Merge "media: Add back the duplication of fd inside MPEG4Writer."