Merge "Tweak linux_glibc properties for musl builds in system/extras"