Android CTS 6.0 Release 31 (4890202)
Merge "When we switched to BSD netcat, no one updated the license."