Android CTS 8.1 Release 2 (4602824)
Merge "Fix some of the netperf socklen_t warnings."
am: d57d6eb463

* commit 'd57d6eb463facae8cd90655290ad97c5a2459065':
  Fix some of the netperf socklen_t warnings.