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

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

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