Merge "Rewrite blocking connects in terms of the non-blocking primitives." into dalvik-dev