Merge "AudioFlinger: rename variables to clarify reference to track channel count or channel mask" into kraken