Merge "init: always kill oneshot services' process groups." am: 8fa4d6c382 am: f45bc91373

Change-Id: Ic26dc11fdf9bc4fae50700250fd06ae01d46d856