am 6bcffcd2: am 8c192fe9: Merge "Better support for rtsp streamed through VLC. Temporarily make the socket blocking to read all of the session description." into gingerbread

Merge commit '6bcffcd2dc410db780c152c70a01b22da6ca58be'

* commit '6bcffcd2dc410db780c152c70a01b22da6ca58be':
  Better support for rtsp streamed through VLC. Temporarily make the socket blocking to read all of the session description.