Merge "Add a very basic userspace reboot watchdog"
am: dc4bd2714c

Change-Id: I0919f5f8ac4177b1dcec4d639f324ae99ec53107