Merge "Allow collection of abi references for cfi variants as well."