This CL separates the NLP gain computation for the different variants of echo estimation. This simplifies the setting of tuning parameters, with resulting transparency improvements and increased echo removal performance. Bug: webrtc:8359 Change-Id: I9b97064396fb6f6e2f418ce534573f68694390a1 Reviewed-on: https://webrtc-review.googlesource.com/7613 Reviewed-by: Gustaf Ullberg <gustaf@webrtc.org> Commit-Queue: Per Åhgren <peah@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20209}