Merge "Use -Werror in external/regex-re2"