Merge "Fix framworks/base compiling against musl" am: 2cba49ac56 am: d5b3d74850 am: 1559860d81

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1828072

Change-Id: Icb4985cf11bb17fd4a66d56f3c0c66c45f1137ee