am 49ec2a0c: Merge "Mark sockets on accept()."

* commit '49ec2a0cdc56fcd6bdd1b0feea127acfabc076f9':
  Mark sockets on accept().