Merge "Allow passing in a mark to use for listen sockets."
am: 698a2ff03c

Change-Id: I1312d08b90efe0d9b5e22e55df1bf5b132a40ce2