Merge "Update watchdogd path"
am: b144c1fc9f

Change-Id: I0c63e6b23b6f30f9c17ce165864acf0686789b84