Merge "Use -Werror in external/regex-re2" am: 7404f5ff5e Change-Id: I1805ec3bd1dc12006c0f1e7a266f7281c2d165c2