Merge "Remove dead subdirs directive." am: 8029112fab

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

Change-Id: I2f5d601baad17a975b90abb6fe3e1d44eeab19ef