Fix idmap leak in zygote process am: 0244ca8d10
am: 82537abc3b

Change-Id: I83d338ebfdefd0f935c4cfb14c3b15efca1cce0f