cm: charger: Fix cm healthd

Change-Id: Ibd8e9470e01d14a11941e47c099d6dd13d5d51cc

charger/Android.mk

@@ -5,7 +5,7 @@ LOCAL_SRC_FILES := healthd_board_cm.cpp
 LOCAL_MODULE := libhealthd.cm
 LOCAL_CFLAGS := -Werror
 LOCAL_C_INCLUDES := \
-    system/core/healthd \
+    system/core/healthd/include \
     bootable/recovery
 ifneq ($(BACKLIGHT_PATH),)
     LOCAL_CFLAGS += -DHEALTHD_BACKLIGHT_PATH=\"$(BACKLIGHT_PATH)\"

charger/healthd_board_cm.cpp

@@ -36,7 +36,7 @@
 #include <sys/timerfd.h>
 #include <linux/rtc.h>
 
-#include "healthd.h"
+#include "healthd/healthd.h"
 #include "minui/minui.h"
 
 #define LOGE(x...) do { KLOG_ERROR("charger", x); } while (0)
@@ -294,9 +294,11 @@ void healthd_board_init(struct healthd_config*)
     char value[PROP_VALUE_MAX];
     int rc = 0, scale_count = 0, i;
     GRSurface **scale_frames;
+    int scale_fps;  // Not in use (charger/cm_battery_scale doesn't have FPS text
+                    // chunk). We are using hard-coded frame.disp_time instead.
 
     rc = res_create_multi_display_surface("charger/cm_battery_scale",
-            &scale_count, &scale_frames);
+            &scale_fps, &scale_count, &scale_frames);
     if (rc < 0) {
         LOGE("%s: Unable to load battery scale image", __func__);
         return;