Merge "MediaTesting: Add Extractor Unit Test" am: dd8a4a8a77 am: a072553e09 am: 1228e2ad18

Change-Id: I65cc302357b483164cef1d3ad6e774d5745f322b