Merge "init: add reboot_on_failure service option" am: a550e7f412
am: d05b5fd333

Change-Id: I212efbb896e12d1403b581b35ebae67a594ffc75