Merge "Supress unused-parameter warnings in external/regexp_re2."