Merge "ART: Fix things for valgrind"