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

Change-Id: Ia722b78f26b8aedfa2c74e5e27537b44aeef3b1e