Android N IOT Preview 4 (NIH40E)
Merge changes I0f3ea18f,I7204e8ab

* changes:
  Update sun.net to OpenJDK8u121-b13.
  Add missing / improve existing change markers in sun.net.