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

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

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