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

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

Change-Id: Ib32ab6edb0e5e25abb98d1366d486994254620ec