Merge "Fix valgrind-test-art-host to run both 32-bit and 64-bit tests."