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

Change-Id: Icf61f973ca5ee0fef2170ff46b998580bd44399a