Move sound patch to the bottom

It has conflicts and needs to be manually resolved.
Temporary fix for buildbot.