Merge "Upgrade to pcre2 version 10.31." am: b66e00ca10
am: 2549a6b3a1

Change-Id: If490d37a661d0b88af2e18e013df35d173ca05f3