Merge changes I4b05e2ee,Icbdee491,Idf571605

* changes:
  Integrate upstream changes in InetSocketAddress from 8u121-b13
  8u121-b13 integration for java.net - Document Android changes
  8u121-b13 integration for java.net - Document Android changes