Merge "Move PlainSocketImpl away from JNI (part 1)"
am: 69a9f0488f

Change-Id: I15dc601b0131acbb7123c665bb265976c53b7479