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

Change-Id: Ic1a03c113d4615d793dae7b4273deb37a956fd5c