Merge "socket: uevent: use SO_RCVBUF instead of SO_RCVBUFFORCE" am: 0a2080bced
am: 571e246983

Change-Id: I95480c609b1d3e5d6ef5d4c27b99a5435dfa97f8