Merge "Fix passing of ExtraAudioDescriptors to audio HAL"