Merge "Ensure property_set connection sockets are CLOEXEC." am: 1ef5ecaca2
am: 5d6e678b9d

Change-Id: I6421dc4b6c504e9f662addcf567ddc4188883e99