Merge "Improve handling MediaCodec linkToDeath() resource manager"