Merge "Move PlainSocketImpl away from JNI (part 1)"