Merge "Fix frameworks/native compiling against musl" am: 79abc0518e am: 06b1d1079f am: 31fab602aa am: 10b2b3884a am: 31ae9afabd

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1826713

Change-Id: Ic3b9bdd60db8202a732b668255a16896bf8a6509