Merge "Make it possible to enable heap poisoning via make variable."