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

Change-Id: Ib8a5b8b494cc2322bc251eba2003317fd1ddfcf0