Merge "Keep gtalk video chat specific code consistent with rtsp changes." into gingerbread