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

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

Change-Id: If534f7c607882338e10c0fadb5424a5c6ba20c7e