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

Change-Id: Iaf71849394ac0f9b8dfd33c18da8fb2f8c4f33f8