Merge "BatteryStats: Better big-little CPU accounting" into mnc-dr-dev