Merge "Handle -Cflag syntax and use prebuilt cargo." am: b517b4614d am: a321869ef5 am: 21480a98b1

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

Change-Id: If0e50b43ddcb271b6f30c069cfd5e1ad5c2c9a4b