Merge "Fix CFI tests for heap poisoning." am: 5d938ef154
am: f76e901d3b

Change-Id: I59ac513135c7b39e9c40df86e609324179290402