Merge "Add health HAL to watchdog" am: 80da7610e1
am: e364e4aa30

Change-Id: Icbcb387c2e428142ab15e2f66771324f5fe03362