Merge "Revert "Revert "Add support for fdsan to the builtin SocketImpls."""
am: 5a8f602ec5

Change-Id: Ia3b738369f91c24ef4f6d6b34ad2432b8df870ee