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

Change-Id: I03a8e1285089021e48b885cc897f11efc0ef8275