Merge "audio: add AdditionalOutputDeviceDelay parameter define"