Revert "vm_sockets: Add flags field in the vsock address data structure"

This reverts commit 40e6fbd09c0de28ebbb0979420eee59892af18bd which is
commit dc8eeef73b63ed8988224ba6b5ed19a615163a7f upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: I5f154d17cb4818466588029d6e5d8e6a8e5b1c25
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

include/uapi/linux/vm_sockets.h

diff --git a/include/uapi/linux/vm_sockets.h b/include/uapi/linux/vm_sockets.h
index 490ca99..67e3938 100644
--- a/include/uapi/linux/vm_sockets.h
+++ b/include/uapi/linux/vm_sockets.h
@@ -22,7 +22,6 @@
 #endif
 
 #include <linux/socket.h>
-#include <linux/types.h>
 
 /* Option name for STREAM socket buffer size.  Use as the option name in
  * setsockopt(3) or getsockopt(3) to set or get an unsigned long long that
@@ -153,13 +152,10 @@ struct sockaddr_vm {
 	unsigned short svm_reserved1;
 	unsigned int svm_port;
 	unsigned int svm_cid;
-	__u8 svm_flags;
 	unsigned char svm_zero[sizeof(struct sockaddr) -
 			       sizeof(sa_family_t) -
 			       sizeof(unsigned short) -
-			       sizeof(unsigned int) -
-			       sizeof(unsigned int) -
-			       sizeof(__u8)];
+			       sizeof(unsigned int) - sizeof(unsigned int)];
 };
 
 #define IOCTL_VM_SOCKETS_GET_LOCAL_CID		_IO(7, 0xb9)