Fix cyclic deps: rent_a_codec<->audio_coding and rent_a_codec<->neteq

webrtc/modules/audio_coding/acm2/rent_a_codec.h

Index: webrtc/modules/audio_coding/acm2/rent_a_codec.h
diff --git a/webrtc/modules/audio_coding/acm2/rent_a_codec.h b/webrtc/modules/audio_coding/acm2/rent_a_codec.h
index 069e1d5f36d4a47bb22205270f806e37dd7cbb64..0a52f564ec6bba07cdb50c8dc319516c774742a1 100644
--- a/webrtc/modules/audio_coding/acm2/rent_a_codec.h
+++ b/webrtc/modules/audio_coding/acm2/rent_a_codec.h
@@ -16,13 +16,13 @@
 #include <memory>
 
 #include "webrtc/api/audio_codecs/audio_decoder.h"
-#include "webrtc/api/audio_codecs/audio_format.h"
 #include "webrtc/base/array_view.h"
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/base/optional.h"
 #include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/modules/audio_coding/codecs/audio_encoder.h"
 #include "webrtc/modules/audio_coding/include/audio_coding_module_typedefs.h"
+#include "webrtc/modules/audio_coding/neteq/neteq_decoder_enum.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -109,42 +109,6 @@ class RentACodec {
     kNone = -1
   };
 
-  enum class NetEqDecoder {
-    kDecoderPCMu,
-    kDecoderPCMa,
-    kDecoderPCMu_2ch,
-    kDecoderPCMa_2ch,
-    kDecoderILBC,
-    kDecoderISAC,
-    kDecoderISACswb,
-    kDecoderPCM16B,
-    kDecoderPCM16Bwb,
-    kDecoderPCM16Bswb32kHz,
-    kDecoderPCM16Bswb48kHz,
-    kDecoderPCM16B_2ch,
-    kDecoderPCM16Bwb_2ch,
-    kDecoderPCM16Bswb32kHz_2ch,
-    kDecoderPCM16Bswb48kHz_2ch,
-    kDecoderPCM16B_5ch,
-    kDecoderG722,
-    kDecoderG722_2ch,
-    kDecoderRED,
-    kDecoderAVT,
-    kDecoderAVT16kHz,
-    kDecoderAVT32kHz,
-    kDecoderAVT48kHz,
-    kDecoderCNGnb,
-    kDecoderCNGwb,
-    kDecoderCNGswb32kHz,
-    kDecoderCNGswb48kHz,
-    kDecoderArbitrary,
-    kDecoderOpus,
-    kDecoderOpus_2ch,
-  };
-
-  static rtc::Optional<SdpAudioFormat> NetEqDecoderToSdpAudioFormat(
-      NetEqDecoder nd);
-
   static inline size_t NumberOfCodecs() {
     return static_cast<size_t>(CodecId::kNumCodecs);
   }