Merge "Blacklist code for CFI."
am: 5f50896a7f

Change-Id: Ic7d3f0a718025a4325d3bea9d62e0ad759853d4e