Merge "Port from pcre to pcre2 (Fix wrong merge decision)" into stage-aosp-master am: 9b5b32c0 am: bba39385 am: d0d38fa2 Change-Id: If589c63a35593ac4a9305e63408467b7970438e2