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

Change-Id: I48e5e2a6a25180c414da45ca18f0d146c5b0b3ef