Merge "init: Cleanly exit subcontext processes upon init's death" am: f86e85cb0a
am: 7b34edaece

Change-Id: I2c0c77273e16ebc6423e764b6f165aa6c2b173d6