Merge "Fixing Compilation error in audio platform"