Revert Android.bp workaround. am: c3d97aa421 am: 12413aa875 am: 7fed2aa21a

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/pcre/+/11308093

Change-Id: I8ff079f508f91b775e89c17d47dee5fa5e9fdfc7