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