Merge "Fix fault_handler with heap poisoning."
am: aa03f6fa38

Change-Id: I8acd9d6f7129c1034c34e1722ac35e5a14d3f3df