Merge "Revert "Move Inet[4]AddressUtils to libs/net""