Bug 972097: fix merge failure (lost 'rtcp_') r=padenot