Merge "Upgrade to pcre2 version 10.31." am: b66e00ca10 am: 2549a6b3a1 am: 4f0782544e
am: 84bb36a891

Change-Id: Ie812ed40b7741b3bcf215182a9d612f0fe0dc68d