Merge "Revert "Mark java.net.InetAddress APIs as stable""