Merge "Use -Werror in external/netcat"