Merge "Make the cflags property configurable" into main am: 1b0d9291

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



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