Merge "Use -Werror in external/netcat" am: f64a25dafe
am: 127af3e66e

Change-Id: I4f6ddaa7ca9c478116323c3e7e450fb2eeda03fd