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