flo: changes for healthd charger mode

Change-Id: Icb616b0962898a47949f6866f795acffaecb6532
diff --git a/device-common.mk b/device-common.mk
index e9321ce..df00011 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -39,8 +39,7 @@
 	lights.msm8960
 
 PRODUCT_PACKAGES += \
-    charger_res_images \
-    charger
+    charger_res_images
 
 # Live Wallpapers
 PRODUCT_PACKAGES += \
diff --git a/init.flo.rc b/init.flo.rc
index 26df07a..c086abc 100644
--- a/init.flo.rc
+++ b/init.flo.rc
@@ -421,8 +421,10 @@
     # Adjust socket buffer to enlarge TCP receive window for high bandwidth (e.g. DO-RevB)
     write /proc/sys/net/ipv4/tcp_adv_win_scale  1
 
-service charger /charger
+service charger /sbin/healthd -c
     class charger
+    critical
+    seclabel u:r:healthd:s0
 
 # virtual sdcard daemon running as media_rw (1023)
 service sdcard /system/bin/sdcard -u 1023 -g 1023 -l /data/media /mnt/shell/emulated