Merge "MediaCodec: add DeathNotifier to BatteryNotifier"