Merge "Stop using SO_SNDBUFFORCE" into pi-dev
am: 4031e1a46e

Change-Id: I3dc8cf106e887567a06cb5e7d2e526df92a7795b