Merge commit '8c192fe990d7bc7149d2ec1a7c9f4ada3f32e52a' into gingerbread-plus-aosp * commit '8c192fe990d7bc7149d2ec1a7c9f4ada3f32e52a': Better support for rtsp streamed through VLC. Temporarily make the socket blocking to read all of the session description.