Merge "Use -Werror in external/iptables"
am: 447f5e3dd7

Change-Id: I80a90b6143bbf53172d8b149c8e34584ad044063