Merge "Fix bug with bind()/connect() and IPv4 addresses" am: 964f576fc3
am: b9b4a2fd69

Change-Id: Ibdeae10deffaa3021b2418fe6afdb010d8fe762a