Merge "Refactored Extractor Fuzzer Plugins" am: 9c1b2c303e

Change-Id: Ic3e1d5baf5711f7fb357aa477c997084ecfac60e