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

Change-Id: If384839e011169eb80d10e546f4501114fdf73f0