Merge branch 'audio-fix' into omap-for-v4.20/fixes