am 54c83fee: am 9925c1a8: Merge "Mark sockets on creation (socket()) and accept4()."

* commit '54c83feebfc3b2046ed9e060e19ba6793dec17c4':
  Mark sockets on creation (socket()) and accept4().