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