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

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

Change-Id: Iae147f53bc4915bc5b6c2c145daaf5c8a26956d8