Replace remaining includes of audioconvert.h with channel_layout.h