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

Change-Id: Ic899b3b5f31726425e585b2c3e4870f6c117a565