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