Merge changes from topic "health_cleanup" into stage-aosp-master

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