Android 7.1.0 release 4
Merge "When we switched to BSD netcat, no one updated the license."