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

Change-Id: I0d62f84f7e50531bd77cd1d7fa55fb29959a21c2