This was an ill tested special case which turned out to be more problem than benefit. The special case was only triggered when the decoder frame size was smaller than 10 ms, which is more or less unsupported by NetEq. Also fixed a bug in a test, a bug which was exposed by the code change. BUG=chromium:654983 Review-Url: https://codereview.webrtc.org/2412883002 Cr-Commit-Position: refs/heads/master@{#14627}