Control combined_audio_video_bwe with config bool.

webrtc/audio_receive_stream.h

Index: webrtc/audio_receive_stream.h
diff --git a/webrtc/audio_receive_stream.h b/webrtc/audio_receive_stream.h
index 44e232c34c8f31134c27910d427c9278725caff9..9a8601de9bd023749bba80d238dc5731c9613592 100644
--- a/webrtc/audio_receive_stream.h
+++ b/webrtc/audio_receive_stream.h
@@ -59,6 +59,9 @@ class AudioReceiveStream : public ReceiveStream {
     // Call::CreateReceiveStream().
     // TODO(solenberg): Use unique_ptr<> once our std lib fully supports C++11.
     std::map<uint8_t, AudioDecoder*> decoder_map;
+
+    // TODO(pbos): Remove config option once combined A/V BWE is always on.
+    bool combined_audio_video_bwe = false;
   };
 
   virtual Stats GetStats() const = 0;