Merge "MediaCodec: clean up resources pending removal at init"