Merge "Fix idmap leak in zygote process"