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

Change-Id: I8e041ac82101f117a9adf6041ace5d9becb6a401