Merge "Ignore -C codegen-units flag" am: 2bbb98ad2f

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

Change-Id: If534566470ecf86931f0f268bac0373fcdbc902e