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

Change-Id: Ia6d0db3bd5271156a6847e09bb32e831641f0139