Merge "Have BatteryStats track and report the running wakelocks."