Merge "MediaCodec: ignore error when linkToDeath to batterystats"