Merge changes If294bbba,I9051e9c6

* changes:
  Move PlainSocketImpl away from JNI (part 2)
  Let SocketTest#getTrafficClass allow ECN bits to be present