am bef76b54: Merge "Add linux/sock_diag.h"

* commit 'bef76b54a6fe747617334e3aaea892a19370cd29':
  Add linux/sock_diag.h