Merge "Use -Werror in external/iputils"
am: 72e5e192a5

Change-Id: I29a4a5156c72307c020fb53bd4de835297d1cf7b