Merge "Revert "init: Terminate gracefully when CAP_SYS_BOOT is absent"" am: b5b4136ac4 am: aa447d7aa5 am: 3734cd3442
am: 387f28c18a

Change-Id: Id00c27b2d10743e0a19a6bfb8da85aa2e2c3f622