Merge "Ignore -C codegen-units flag" am: 2bbb98ad2f am: 10987326b1 am: 2024e0ff67 am: 8d9985429e

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

Change-Id: Ia31de1459d9af1fb5edec0c318971078952a88bb