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

Change-Id: Iac05b8228a7ab586cadb225687112d586f4cf8a9