Merge "Fix idmap2 compiling against musl" into stage-aosp-master am:...

Merge "Fix idmap2 compiling against musl" into stage-aosp-master am: 5f9fe6e3 am: 866e277b am: 4f4ef93a am: 734e3fa5

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

Change-Id: I5d96fee54242751b39220802b7716ca6d991658d