Merge "Update fuzz_test makefile."
am: 64e48c0b51

Change-Id: I150afee55af70d7c4094e41ebab066af3cd30c26