Merge "Avoid incompatible audio_port_config"