Revert "Local healthd for htc devices"

This reverts commit 2716e3c41033202718c7fd913de7a0831c27b27c.

Uploaded to wrong branch.