Merge "Fix handling of codegen flags." into main am: 1c88976e6d

Original change: https://android-review.googlesource.com/c/platform/development/+/2832575

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