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

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

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