Merge "Remove a few glibc #if hacks." into main am: 6717b2d3e6

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

Change-Id: Ic88624af4897947119d7d5d1c1372b7961c81a66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>