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

Change-Id: Ic3d77eee31922d46ac1c0364ce488435f39911d9