Merge "Update watchdogd path"
am: 2d8fb579d5

Change-Id: I7c312754b2ec6d5f0094b04a6a6bfbbe395e07ae