Merge "Move trimV4AddrZeros to libs/net"