Merge "Tweak linux_glibc properties for musl builds in system/extras" am: 5cb11a82cc am: 8a4c799617

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2044007

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