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

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

Change-Id: Ice0d69e40e9d8629ae7f43a12e247f1153c90f85