clean up incomplete revert in r4357
Also revert r4319, will follow up with pbos

Reason for recent series of reverts: video freezes when testing with packet loss

R=mikhal@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/1817004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4359 4adac7df-926f-26a2-2b94-8c16560cd09d
3 files changed