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

Change-Id: I84eb8cd8479db999f750a0186b6f12cd2f644109