Merge "fuzzer: Updates to fuzzer plugin"
am: 25e615b9cb

Change-Id: Ic4b2c071197abb0b08774f0a4f5f71bf6ad17225