Merge "healthd: Drop the unneeded include path." am: 29247e5133 am: 04adb88892
am: a4686bba53

Change-Id: Ife683995d233ef81e96f473ef96a87fb33fb08af