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

Change-Id: Iceb7356e8c81c3d1f18122053864ff2914c39865