Merge "DropBoxManager: Allow adding a file using an fd"