Reland r6707 with the fix for callclient.cc.

TBR=mallinath@webrtc.org
BUG=3310

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

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