Merge "Add dosfstools to files"