Merge "Have init kill the process group." am: 9a5300fcb8 am: 963de55342 am: cb647e9318
am: 54c7d892a1

Change-Id: I5b285ae43345036380671ee9a623f846813dc212