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

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

Change-Id: I23fe2b8851404c74fbe140f226f668ee06c862ee