This reverts commit 4f0a15a8. Reason for revert: art-test gtest-heap-poisoning is broken with this change. Change-Id: I736374766b216122cae4e7e97451951cda1551f9