[Telemetry] Fix C-State stat reading for Note 3 and S5.

tools/telemetry/telemetry/core/platform/power_monitor/sysfs_power_monitor.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import collections
 import logging
 import os
 import re
 
 from telemetry import decorators
@@ skipping 71 matching lines @@
 
   def GetCpuState(self):
     """Retrieve CPU c-state residency times from the device.
 
     Returns:
         Dictionary containing c-state residency times for each CPU.
     """
     stats = {}
     for cpu in self._cpus:
       cpu_state_path = os.path.join(CPU_PATH, cpu, 'cpuidle/state*')
-      stats[cpu] = self._platform.RunCommand(
-          'cat %s %s %s; date +%%s' % (os.path.join(cpu_state_path, 'name'),
-          os.path.join(cpu_state_path, 'time'),
-          os.path.join(cpu_state_path, 'latency')))
+      output = self._platform.RunCommand(
+          'cat %s %s %s; date +%%s' % (
+              os.path.join(cpu_state_path, 'name'),
+              os.path.join(cpu_state_path, 'time'),
+              os.path.join(cpu_state_path, 'latency')))
+      stats[cpu] = re.sub('\n\n+', '\n', output)
     return stats
 
   def GetCpuFreq(self):
     """Retrieve CPU frequency times from the device.
 
     Returns:
         Dictionary containing frequency times for each CPU.
     """
     stats = {}
     for cpu in self._cpus:
@@ skipping 86 matching lines @@
     Returns:
         Dictionary in the format returned by StopMonitoringPower.
     """
     if not cpu_stats:
       return power_stats
     if 'component_utilization' not in power_stats:
       power_stats['component_utilization'] = {}
     for cpu in cpu_stats:
       power_stats['component_utilization'][cpu] = cpu_stats[cpu]
     return power_stats