Fix Sound/core/pcm upstream mismerge