Merge "MediaTesting: Add Extractor Unit Test"
am: dd8a4a8a77

Change-Id: Iaab18892e136eb01ae48f00bc44002d2ffde7a79