Merge "Fix idmap2 compiling against musl" into stage-aosp-master am: 5f9fe6e37c am: 866e277bc6 am: 4f4ef93a8e

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

Change-Id: If23a4e134f87e6aa49ae9a73c16dd5d400a5759e