Merge "Enable libpcre2 on linux_bionic builds" am: 8d900ce60a
am: 9777d249c8

Change-Id: I6cb32e5fdb19796b9d532a60baa6145189917447