Android 7.1.1 Release 31 (N4F26U)
Merge "When we switched to BSD netcat, no one updated the license."