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

Change-Id: I6a82c6ce99080fa92bc847aed0f0859cacaf12c9