Merge "Suppress unused-parameter warnings in external/pcre/" am: 0b62c4871d
am: 6165bed529

Change-Id: Ib2939466b7bc6b2221b066e68bb1f8f87ba830d3