[automerger skipped] Merge "Build against cfi supported coverage lib" am:...

[automerger skipped] Merge "Build against cfi supported coverage lib" am: 0ae13ec3 am: 1efd2a75 am: 735f8827 -s ours

am skip reason: Change-Id I8e0421cdf1c6e499292cfa3457cefd3c42f13155 with SHA-1 7e82baa8 is in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1546369

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If4ddb58c4e180146820726e411f5e4b727aabc3e