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

Change-Id: I2cfd6d6e1cbd6e538fd99ec5fa28eb829ce7100e