Merge "Use -Werror in external/pcre"
am: 2ea2c73314

Change-Id: I6ba6dd08b54b9251f69acca2db3fa5d52472a659