Merge "AudioMixer: Always do prepareForReformat() in setChannelMasks()" into pi-dev
am: e83ac21bf2

Change-Id: If0d24de9fef3e6eaa47c3e59225dfc97f339daf7