Merge "Revert "init: Terminate gracefully when CAP_SYS_BOOT is absent"" am: b5b4136ac4
am: aa447d7aa5

Change-Id: I0f8723f216d8674a5670ae3ac4fcc1111043ad71