Merge "Move trimV4AddrZeros to libs/net"

     */

    @UnsupportedAppUsage

    public static String trimV4AddrZeros(String addr) {

        if (addr == null) return null;

        String[] octets = addr.split("\\.");

        if (octets.length != 4) return addr;

        StringBuilder builder = new StringBuilder(16);

        String result = null;

        for (int i = 0; i < 4; i++) {

            try {

                if (octets[i].length() > 3) return addr;

                builder.append(Integer.parseInt(octets[i]));

            } catch (NumberFormatException e) {

                return addr;

            }

            if (i < 3) builder.append('.');

        }

        result = builder.toString();

        return result;

        return Inet4AddressUtils.trimAddressZeros(addr);

    }

    /**