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

Change-Id: I2a5b587e80cc3894641229dc4283c1c76c59d23b