Merge "Fix fd leak in media.codec"