Merge "Fix patchoat_test for heap poisoning"