am b9620f30: Merge "ART: Fix things for valgrind"

* commit 'b9620f305c79914f5159cf9279a7ccd173af1186':
  ART: Fix things for valgrind