Merge "Revert "Tweak linux_glibc properties for musl builds in prebuilts/sdk"" am: 6c9cc17dba am: 4ddcb13caa

Original change: https://android-review.googlesource.com/c/platform/prebuilts/sdk/+/2050249

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