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

Change-Id: Ia3664d28e7956a1a890834762a6ea29bb2402c0c