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

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

Change-Id: Idee24ad18e175e6806aa933e8ec9f57ec87fba4a