Switch to using new ACM methods for encoder management

webrtc/modules/audio_coding/acm2/rent_a_codec_unittest.cc

Index: webrtc/modules/audio_coding/acm2/rent_a_codec_unittest.cc
diff --git a/webrtc/modules/audio_coding/acm2/rent_a_codec_unittest.cc b/webrtc/modules/audio_coding/acm2/rent_a_codec_unittest.cc
index d0a94cf2d268f3bc57083eb7e746456524843864..028a27108cdaf52df0c5bb56a65c59e81ff5a6f2 100644
--- a/webrtc/modules/audio_coding/acm2/rent_a_codec_unittest.cc
+++ b/webrtc/modules/audio_coding/acm2/rent_a_codec_unittest.cc
@@ -222,13 +222,11 @@ TEST(RentACodecTest, RentEncoderError) {
   EXPECT_FALSE(rent_a_codec.RentEncoder(codec_inst));
 }
 
-#if GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
 TEST(RentACodecTest, RentEncoderStackWithoutSpeechEncoder) {
   RentACodec::StackParameters sp;
   EXPECT_EQ(nullptr, sp.speech_encoder);
-  EXPECT_DEATH(RentACodec().RentEncoderStack(&sp), "");
+  EXPECT_EQ(nullptr, RentACodec().RentEncoderStack(&sp));
 }
-#endif
 
 }  // namespace acm2
 }  // namespace webrtc