Fix selective retransmissions after corrupt merge in r1373.
Fix selective retransmissions after corrupt merge in r1373.

BUG=228
TEST=

Review URL: http://webrtc-codereview.appspot.com/345006

git-svn-id: 917f5d3ca488f358c4d40eaec14422cf392ccec9@1414 4adac7df-926f-26a2-2b94-8c16560cd09d

ShiftMediaProject/libilbc,mwgoldsmith/ilbc,TimothyGu/libilbc,mwgoldsmith/ilbc,TimothyGu/libilbc,mwgoldsmith/libilbc,mwgoldsmith/libilbc,ShiftMediaProject/libilbc,mwgoldsmith/libilbc,TimothyGu/libilbc,ShiftMediaProject/libilbc,TimothyGu/libilbc,mwgoldsmith/ilbc,TimothyGu/libilbc,mwgoldsmith/ilbc,ShiftMediaProject/libilbc,mwgoldsmith/libilbc,ShiftMediaProject/libilbc