Merge "Fix BatteryStatsViewer makefile..." into sc-dev