Merge "Add product_available to product available modules" am: 5c85a2da4c am: 00bb7d15e6 am: 1ee3c9c360

Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/1496000

Change-Id: I048ac498b4e1c234a3410d3434de3267a930b216