Merge "IBatteryStats.aidl update path"