Update code from webrtc rev r6483.  Untested.
Forgot to add these files.