Merge branch 'sock_map: clean up and refactor code for BPF_SK_SKB_VERDICT'