Merge "Use -Werror in external/iputils"