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

Change-Id: I4ea97ec3c2ba52dd274e1e3e85738d0bb7b740c3