Merge "Add product_available to product available modules" am: 6e92f56bf8 am: 7985109870 am: 1e5a61835e

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

Change-Id: I6badde86fc9f4f25e359ceb66eb35633942ef661