Merge "scandir: clarity improvements." am: 9dfcaa64e8

Original change: https://android-review.googlesource.com/c/platform/bionic/+/2512139

Change-Id: Iba7e4439d7ef251c69c7399698a3c74443ae2da3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>