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

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

Change-Id: I443e0d69add2a5e612179a5da056657722cdb032