am f96a3386: am e5c0550d: am 267240f2: Merge "BatteryStats: Clear power use when removing a UID from uid_cputime kernel module" into mnc-dev

* commit 'f96a33865b03ed092f6e902b4bea5ec5db481cdc':
  BatteryStats: Clear power use when removing a UID from uid_cputime kernel module