Merge "Add health HAL to dump" am: d2be1a96be
am: 4b94f206cb

Change-Id: I6a26a623f057eabd0423e177b1c71fa993155da7