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

Change-Id: Ie6da12fc0c23f55069c0c75282ae649483162e5b