Merge "Fix patchoat_test for heap poisoning"
am: 2607d6c471

Change-Id: Ifc148bb34e6610a88d580f16d260bc5f0e7caa2e