Merge "Set incremental or codegen-units, not both" into main am: ed75eef9...

Merge "Set incremental or codegen-units, not both" into main am: ed75eef9 am: 72fd3d4e am: 25cb5d5d am: a1ca35ee

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



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