Merge "Fix fuzzer name and sizeof(array)"
am: f5b2927908

Change-Id: I356d5474d304fa28606e53deac5cf9b8c2059711