Merge "Revert "Reapply "Add support for product-specific build flags""" into main am: 5f24ce61

Original change: https://android-review.googlesource.com/c/platform/build/+/2818085



Change-Id: If2e2f47e8bd2e3d76feda72124784b5da4e59c45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>