Merge "Fix fuzzer name and sizeof(array)" am: f5b2927908 am: 3b5491253f am: 7a03a56312
am: 213b4d8770

Change-Id: Ieb2896f2ce0356b0e65aa82b070bd9f70ad147b4