Merge "Add product_available to product available modules" am: 2fcdd1881d am: 4cade316bd

Original change: https://android-review.googlesource.com/c/platform/external/llvm/+/1495980

Change-Id: I808a875a4b1f2f0fbf9e990e323778d7efc613fd