Merge "Move watchdogd out of init" am: 132615b803 am: 3676564019 am: bcfa596974
am: a84174abf1

Change-Id: Iab782a8a292f514211732ca9d04e55b05ae879aa