Merge "Benchmark: add Extractor" am: 431988bcfa am: b96cec5792
am: ff856819f8

Change-Id: I14de77b6bf90cc64088fd7ffc4dec8172f0f6997