Merge "Use -Werror in external/regex-re2" am: 7404f5ff5e am: f76f017f28
am: 6ca7d87dbd

Change-Id: I7835167d1a9aa9d8704293294f98916e65573641