Merge "Use unique_fd for most places where sync file fd is used"