Merge "extensions: libxt_socket: add --restore-skmark option"