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

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

Change-Id: I3afbdadac47bf9e2b66fb1287357299e67ccb99a