Merge changes from topic "health_cleanup"

* changes:
  storaged: fix headers.
  healthd: add missing libbatteryservice_headers dep