Merge "Update fuzz_test makefile."