* commit 'de478eca19adc263c033d777b0e6a33c8113fd24': Fix issue #4068088: NPE at com.android.internal.os.BatteryStatsImpl...