Merge "Use -Werror in external/safe-iop"
am: 5ddbb866a2

Change-Id: I3733f282d364a59f5c907ccfa3d1bf7615d4a218