Merge "Fix idmap2 compiling against musl"