Merge "Revert "Remove support for Valgrind in ART."" am: 197f1ef6f4
am: 2956d0ce8a

Change-Id: If4bca2f75242707d9bc194df8112f7d51ba0ff1d