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

Change-Id: Ie6d81482f7f1cb38e694fb1428d22143327f99c8