Reland: Use actual audio channel count in Spitzer audio decoder

media/filters/android/media_codec_audio_decoder.h

Index: media/filters/android/media_codec_audio_decoder.h
diff --git a/media/filters/android/media_codec_audio_decoder.h b/media/filters/android/media_codec_audio_decoder.h
index 642ea32a3c901161b09b692026612f4d448632e7..57d4b86991f30b45bd78c0a0970c1638d608da24 100644
--- a/media/filters/android/media_codec_audio_decoder.h
+++ b/media/filters/android/media_codec_audio_decoder.h
@@ -8,6 +8,7 @@
 #include <deque>
 #include <memory>
 #include <utility>
+#include <vector>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
@@ -237,6 +238,9 @@ class MEDIA_EXPORT MediaCodecAudioDecoder : public AudioDecoder {
   // Cached decoder config.
   AudioDecoderConfig config_;
 
+  // Actual channel count that comes from decoder may be different than config.
+  int channel_count_;
+
   // Callback that delivers output frames.
   OutputCB output_cb_;