Merge changes I8ae16870,Ic0eb09df

* changes:
  audio: Allow using vendor extensions in surround formats (V6)
  audio: Allow using vendor extensions in surround formats (V5)