Merge "installd _delete_dir_contents: add O_NOFOLLOW"