Merge "Remove linux_glibc musl hack" am: d5aa2e0da3 am: f7daa06e3a

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2049205

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