DO NOT MERGE:Add missing SOCK_CLOEXEC flag when opening socket am: bef09aaf9e  -s ours am: b1fada1564
am: 466a521607  -s ours

Change-Id: I5f52d3e2b5fff92059670c1ff78a847a2a0066a2