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

Change-Id: I56391882ee049439005eba665fca37e4eea35459