Merge "audio_server: Unify audio_patch creation"