Merge "Revert "Tweak linux_glibc properties for musl builds in prebuilts/sdk""