am bafedc34: Merge "Get heap poisoning working in 64-bit."

* commit 'bafedc3424c3660d5d5e3ef190b3ac8313a5a59e':
  Get heap poisoning working in 64-bit.