am fbe1cc92: Merge "Don\'t include <linux/socket.h> directly."

* commit 'fbe1cc92d9e8930700c15f68717dd66fc1523177':
  Don't include <linux/socket.h> directly.