Merge "init: make triggering shutdown from vendor_init better" am: b34291bcb6 am: f6bc6fa1b7
am: 155ac3700e

Change-Id: Ic7705980f53bb2bf44702bcc0543d74c1d7ea7cd