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

Change-Id: I5dc1e8c2ad06b162e3971aa2385dc7c00d5a37d0