[automerger skipped] Allow collection of abi references for cfi variants as well.
am: d39c61bdd0 -s ours
Change-Id: I162a6749df77fefbd54d768b247d1207a9a941a4
This commit is contained in:
am: d39c61bdd0 -s ours
Change-Id: I162a6749df77fefbd54d768b247d1207a9a941a4