This partially reverts commit 4659036941 ("ANDROID: Fix up KABI
breakage in 5.4.151 in struct sock")
Then fixes things up in such a way that
BUILD_CONFIG=build/build.config.net_test for kernel_test
still works.
Bug: 202712021
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I40e24d7924fcffc23a2b8cc5ad50049808aa9455
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>