Merge "Use -Werror in external/safe-iop" am: 5ddbb866a2 am: b9863012c0 am: 46aae194f7
am: 4e20417f76

Change-Id: Ib5187d01d28cfac4abe5f3a5d7526a08a4078544