Merge "scandir: remove dead code." am: b6ed09d323 am: b966c33e09

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

Change-Id: I6cf425e24379f0feb9a3beacee14cb0f3926f47b