Merge "Avoid double close in delete_dir_contents."