With a heap poisoning fix. This reverts commit cf91c7d9. Bug: 9986565 Change-Id: Ia72edbde65ef6119e1931a77cc4c595a0b80ce31