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

Change-Id: I21d6f0f54c2b11246cad808e28155ecced9966db