Merge "Prevent LocalSocket from creating an fd if fd is already there" am: 616910fd am: d76576b6 am: e0211af8 Change-Id: I5ac57ca6439359fc65622254090a3ea6cc2aec18