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

* changes:
  libbatteryservice_headers: export libutils_headers
  libbatteryservice: remove binder details
  Remove include/batteryservice