am 198c9b9b: am 02f7a784: am fd07d616: am fbe1cc92: Merge "Don\'t include <linux/socket.h> directly."

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