Switch to using new ACM methods for encoder management

webrtc/modules/utility/source/coder.h

Index: webrtc/modules/utility/source/coder.h
diff --git a/webrtc/modules/utility/source/coder.h b/webrtc/modules/utility/source/coder.h
index 399edbd7fb8e162315e04aafde9273ae58a1dc5a..9536a027d0e913aad4b50c3c3db77365eaa85cf8 100644
--- a/webrtc/modules/utility/source/coder.h
+++ b/webrtc/modules/utility/source/coder.h
@@ -14,6 +14,8 @@
 #include <memory>
 
 #include "webrtc/common_types.h"
+#include "webrtc/modules/audio_coding/acm2/codec_manager.h"
+#include "webrtc/modules/audio_coding/acm2/rent_a_codec.h"
 #include "webrtc/modules/audio_coding/include/audio_coding_module.h"
 #include "webrtc/typedefs.h"
 
@@ -48,6 +50,8 @@ protected:
 
 private:
  std::unique_ptr<AudioCodingModule> _acm;
+ acm2::CodecManager codec_manager_;
+ acm2::RentACodec rent_a_codec_;
 
     CodecInst _receiveCodec;