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

Change-Id: Ief2e969ec0498ac2c9264fa34a3de36773bc43fa