Revert "i9500: audio: fixed channel count determination from channel mask"

Breaks the whole building process

This reverts commit a5d5b03631bc3fc68b3b885a557ff0d5e0fb4ea1.

Change-Id: I8f4a44d4755eb9187c3a494031ceb5b4a2c8ea76
Merge branch into kk_mkt