Merge "Merge "init: reap zombies only after kill(-pid, ...)" am: a51c40ce35 am: 0924b32c1f am: 419a9ef8f1" into oc-dr1-dev-plus-aosp
am: 3dcfd2e6ad

Change-Id: I57d6b64e2f82da8ed4bfb62bc5b74123f7ab3e43