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

Change-Id: I54c3d78d16069abce64f007942fda7e28f703303