Makefile changes for Valgrind module after porting in master.