doctor: Tweak git-clean suggestion for empty dirs

git clean -f is not enough. Needs `-d` somtimes to
handle cases when we rename a dir.

Fixes #18544 and fixes #14224