Merge "init: trigger shutdown directly from builtins"
am: a5a107fb6d

Change-Id: I5ddb1a1db2f52b931fe851aacd36bf465b9affd6