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

Change-Id: I84f726f12c27f66c668026f913708bb8d2a7cfff