Merge "Clean up handling of multiple architectures in valgrind makefiles."