Merge "Update watchdogd path" am: 2d8fb579d5 am: c2258c35ad am: ec9d26575f
am: 187f675155

Change-Id: I286b66413c849b0e91878b5d9e4c910700e35b12