Merge "Use -Werror in external/compiler-rt"