Merge "Add utils to convert Inet4Address <-> int" am: 5caebe3415
am: 2595e68176

Change-Id: Ia6830f33233210ea12816d6f099300231a7f9f6b