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

Change-Id: I247fa7867eb721746916c8e2bc93c288569a97c9