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