Merge "DropboxManager: Add err message if passing an invalid fd to addFile()"