[automerger skipped] Merge "Allow collection of abi references for cfi...
[automerger skipped] Merge "Allow collection of abi references for cfi variants as well." into pi-dev am: c766e773 -s ours
am: 525b2139 -s ours
Change-Id: Ic43d637e92631c28471d63564d7734348b3a16ca