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 am: 82cf0ad2

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



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