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

Change-Id: I96ec1ff6c061afef157600680ac0df2d3534c868