Merge "Fix idmap leak in zygote process" am: f5ad44b60a am: 4720125a3c
am: 3e15d09ed4

Change-Id: I7d3d7d72e92a66c48b68165e5e3d26a1ccd1b56a