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