Merge "recvfrom takes a non-const pointer." am: 96660b37a1 am: 2f4c6e3d0d
am: c41a11a0ee

Change-Id: I48c43a9675568c6b6edbf2a94f51a21770196f2c