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

Change-Id: I0ce21c35630cb62fe557143cbc4257a1adee362f