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

Change-Id: I611200ddf507369b3a16033c0ae245cc88deda22