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

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



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