Merge "Update fuzz_test makefile." am: 64e48c0b51 am: 625820cf3a
am: e0f8e4dfe8

Change-Id: Ic9d52719dc6c49d4c617a96cdb1db8d1b9b517f6