Merge "More cleanup for #inclusivefixit." am: cde09224eb

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

Change-Id: I3ae230aca404392f5873de958f9b6f9ba5063e04