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

Change-Id: I105a9103888ec885a59c29550877a19b3e891e3f