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

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

Change-Id: I37be043973c3b3ef496fc9800c9db045fa17d703