Merge UpdateBandwidthEstimate with Update in AimdRateControl.

webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc

Index: webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc
index 56ac85ab935ccfb0cfb95040c38269a5417ff23b..1a101aa2e33fd4a1492acc132fc09a58fbc1a854 100644
--- a/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc
+++ b/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc
@@ -193,8 +193,7 @@ void RemoteBitrateEstimatorSingleStream::UpdateEstimate(int64_t now_ms) {
   const RateControlInput input(bw_state,
                                incoming_bitrate_.Rate(now_ms),
                                mean_noise_var);
-  remote_rate->Update(&input, now_ms);
-  uint32_t target_bitrate = remote_rate->UpdateBandwidthEstimate(now_ms);
+  uint32_t target_bitrate = remote_rate->Update(&input, now_ms);
   if (remote_rate->ValidEstimate()) {
     process_interval_ms_ = remote_rate->GetFeedbackInterval();
     RTC_DCHECK_GT(process_interval_ms_, 0);