Merge "Fix valgrind heap_test."