Merge commit '99fa510e67cb973b45fc216c75bdc817421e14ae' into gingerbread-plus-aosp * commit '99fa510e67cb973b45fc216c75bdc817421e14ae': Better detection of connection problems - timeout if no rtcp packets arrive within a certain time, not a final frame (which may take longer)