Merge "Cleanup for #inclusivefixit." am: b1d27cab96

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

Change-Id: I21e6115b52979fa519ff7252bd40f5ec8b54a18f