Merge "AudioMixer: recreate Resampler if the track channel count has changed" into pi-dev am: 292838cca7
am: be83a90bac

Change-Id: I7f5051deed0d459e0a1cae0919b976fd98bac3aa