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

Change-Id: I2f2958928a3f771c3751823a86bc903884c6acad