Merge "AudioMixer: Change setBufferProvider order of reset"