audio: fixed channel count determination from channel mask

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

Bug: 15000850.
Change-Id: I7af794e4515cd0f85e5b9744bd4e53e33aa0d5eb
diff --git a/src/android/AudioPlayer_to_android.cpp b/src/android/AudioPlayer_to_android.cpp
index f318148..7275dee 100644
--- a/src/android/AudioPlayer_to_android.cpp
+++ b/src/android/AudioPlayer_to_android.cpp
@@ -874,7 +874,7 @@
         return SL_RESULT_CONTENT_UNSUPPORTED;
     }
     // Are there the right number of channels in the mask?
-    if (popcount(mask) != numChans) {
+    if (audio_channel_count_from_out_mask(mask) != numChans) {
         return SL_RESULT_CONTENT_UNSUPPORTED;
     }
     // check against unsupported channels