Merge "fuzzer: Updates to fuzzer plugin"
am: 01478942b6

Change-Id: I4f87dd850a45ef35078fdeaeab37a03afc934bb2