i9500: eS325: Fix typo

Change-Id: I71bd2137af47434ed82118bf374bc55688aa488b
i9500: audio: fixed channel count determination from channel mask

Do not use popcount() to derive channel count from channel mask.

Change-Id: I7c086405618d1404f7454c375acc58dd5bc157b8
Merge branch into kk_mkt