Android CTS 6.0 release 2
Merge "When we switched to BSD netcat, no one updated the license."